[front] Align ui filters on runtime mapping capability (#2936)

OpenCTI-Platform · Mar 5, 2023 · fb1488c · fb1488c
1 parent c34a9fd
commit fb1488c
Show file tree

Hide file tree

Showing 15 changed files with 91 additions and 98 deletions.
diff --git a/opencti-platform/opencti-front/src/private/components/Search.js b/opencti-platform/opencti-front/src/private/components/Search.js
@@ -183,7 +183,7 @@ class Search extends Component {
       creator: {
         label: 'Creator',
         width: '12%',
-        isSortable: true,
+        isSortable: isRuntimeSort,
       },
       objectLabel: {
         label: 'Labels',

diff --git a/opencti-platform/opencti-front/src/private/components/analysis/ExternalReferences.tsx b/opencti-platform/opencti-front/src/private/components/analysis/ExternalReferences.tsx
@@ -40,7 +40,7 @@ const ExternalReferences: FunctionComponent<ExternalReferencesProps> = () => {
     },
   );
   const { sortBy, orderAsc, searchTerm, filters, numberOfElements } = viewStorage;
-  const isRuntimeSort = helper?.isRuntimeFieldEnable();
+  const isRuntimeSort = helper?.isRuntimeFieldEnable() ?? false;
   const dataColumns = {
     source_name: {
       label: 'Source name',
@@ -60,7 +60,7 @@ const ExternalReferences: FunctionComponent<ExternalReferencesProps> = () => {
     creator: {
       label: 'Creator',
       width: '12%',
-      isSortable: isRuntimeSort ?? false,
+      isSortable: isRuntimeSort,
     },
     created: {
       label: 'Creation date',

diff --git a/opencti-platform/opencti-front/src/private/components/analysis/Groupings.tsx b/opencti-platform/opencti-front/src/private/components/analysis/Groupings.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import React, { FunctionComponent, useContext } from 'react';
 import ListLines from '../../../components/list_lines/ListLines';
 import GroupingsLines, {
   groupingsLinesQuery,
@@ -16,7 +16,6 @@ import {
   GroupingsLinesPaginationQuery$variables,
 } from './groupings/__generated__/GroupingsLinesPaginationQuery.graphql';
 import { GroupingLine_node$data } from './groupings/__generated__/GroupingLine_node.graphql';
-import { ModuleHelper } from '../../../utils/platformModulesHelper';
 import { GroupingLineDummy } from './groupings/GroupingLine';
 
 const LOCAL_STORAGE_KEY = 'view-groupings';
@@ -33,6 +32,7 @@ const Groupings: FunctionComponent<GroupingsProps> = ({
   authorId,
   onChangeOpenExports,
 }) => {
+  const { helper } = useContext(UserContext);
   const additionnalFilters = [];
   if (authorId) {
     additionnalFilters.push({
@@ -87,7 +87,7 @@ const Groupings: FunctionComponent<GroupingsProps> = ({
     groupingsLinesQuery,
     paginationOptions,
   );
-  const renderLines = (helper: ModuleHelper | undefined) => {
+  const renderLines = () => {
     let exportContext = null;
     if (objectId) {
       exportContext = `of-entity-${objectId}`;
@@ -104,7 +104,7 @@ const Groupings: FunctionComponent<GroupingsProps> = ({
       ...finalFilters,
       entity_type: [{ id: 'Grouping', value: 'Grouping' }],
     };
-    const isRuntimeSort = helper?.isRuntimeFieldEnable();
+    const isRuntimeSort = helper?.isRuntimeFieldEnable() ?? false;
     const dataColumns = {
       name: {
         label: 'Name',
@@ -119,12 +119,12 @@ const Groupings: FunctionComponent<GroupingsProps> = ({
       createdBy: {
         label: 'Author',
         width: '12%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       creator: {
         label: 'Creators',
         width: '12%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       objectLabel: {
         label: 'Labels',
@@ -143,7 +143,7 @@ const Groupings: FunctionComponent<GroupingsProps> = ({
       },
       objectMarking: {
         label: 'Marking',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
         width: '8%',
       },
     };
@@ -221,16 +221,12 @@ const Groupings: FunctionComponent<GroupingsProps> = ({
     );
   };
   return (
-    <UserContext.Consumer>
-      {({ helper }) => (
-        <div>
-          {renderLines(helper)}
-          <Security needs={[KNOWLEDGE_KNUPDATE]}>
-            <GroupingCreation paginationOptions={paginationOptions} />
-          </Security>
-        </div>
-      )}
-    </UserContext.Consumer>
+    <div>
+        {renderLines()}
+        <Security needs={[KNOWLEDGE_KNUPDATE]}>
+          <GroupingCreation paginationOptions={paginationOptions} />
+        </Security>
+      </div>
   );
 };
 

diff --git a/opencti-platform/opencti-front/src/private/components/analysis/Reports.tsx b/opencti-platform/opencti-front/src/private/components/analysis/Reports.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import React, { FunctionComponent, useContext } from 'react';
 import ListLines from '../../../components/list_lines/ListLines';
 import ReportsLines, { reportsLinesQuery } from './reports/ReportsLines';
 import ReportCreation from './reports/ReportCreation';
@@ -12,7 +12,6 @@ import {
   ReportsLinesPaginationQuery$variables,
 } from './reports/__generated__/ReportsLinesPaginationQuery.graphql';
 import { Filters } from '../../../components/list_lines';
-import { ModuleHelper } from '../../../utils/platformModulesHelper';
 import { ReportLine_node$data } from './reports/__generated__/ReportLine_node.graphql';
 import useEntityToggle from '../../../utils/hooks/useEntityToggle';
 import useQueryLoading from '../../../utils/hooks/useQueryLoading';
@@ -32,6 +31,7 @@ const Reports: FunctionComponent<ReportsProps> = ({
   authorId,
   onChangeOpenExports,
 }) => {
+  const { helper } = useContext(UserContext);
   const additionnalFilters = [];
   if (authorId) {
     additionnalFilters.push({
@@ -87,7 +87,7 @@ const Reports: FunctionComponent<ReportsProps> = ({
     reportsLinesQuery,
     paginationOptions,
   );
-  const renderLines = (helper: ModuleHelper | undefined) => {
+  const renderLines = () => {
     let exportContext = null;
     if (objectId) {
       exportContext = `of-entity-${objectId}`;
@@ -99,7 +99,7 @@ const Reports: FunctionComponent<ReportsProps> = ({
       ...renderFilters,
       entity_type: [{ id: 'Report', value: 'Report' }],
     };
-    const isRuntimeSort = helper?.isRuntimeFieldEnable();
+    const isRuntimeSort = helper?.isRuntimeFieldEnable() ?? false;
     const dataColumns = {
       name: {
         label: 'Title',
@@ -114,12 +114,12 @@ const Reports: FunctionComponent<ReportsProps> = ({
       createdBy: {
         label: 'Author',
         width: '12%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       creator: {
         label: 'Creators',
         width: '12%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       objectLabel: {
         label: 'Labels',
@@ -138,7 +138,7 @@ const Reports: FunctionComponent<ReportsProps> = ({
       },
       objectMarking: {
         label: 'Marking',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
         width: '8%',
       },
     };
@@ -220,18 +220,14 @@ const Reports: FunctionComponent<ReportsProps> = ({
     );
   };
   return (
-    <UserContext.Consumer>
-      {({ helper }) => (
-        <ExportContextProvider>
+      <ExportContextProvider>
           <div>
-            {renderLines(helper)}
+            {renderLines()}
             <Security needs={[KNOWLEDGE_KNUPDATE]}>
               <ReportCreation paginationOptions={paginationOptions} />
             </Security>
           </div>
-        </ExportContextProvider>
-      )}
-    </UserContext.Consumer>
+      </ExportContextProvider>
   );
 };
 

diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/Vulnerabilities.tsx b/opencti-platform/opencti-front/src/private/components/arsenal/Vulnerabilities.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import ListLines from '../../../components/list_lines/ListLines';
 import VulnerabilitiesLines, {
   vulnerabilitiesLinesQuery,
@@ -14,8 +14,11 @@ import {
   VulnerabilitiesLinesPaginationQuery$variables,
 } from './vulnerabilities/__generated__/VulnerabilitiesLinesPaginationQuery.graphql';
 import { usePaginationLocalStorage } from '../../../utils/hooks/useLocalStorage';
+import { UserContext } from '../../../utils/hooks/useAuth';
 
 const Vulnerabilities = () => {
+  const { helper } = useContext(UserContext);
+  const isRuntimeSort = helper?.isRuntimeFieldEnable() ?? false;
   const { viewStorage, helpers, paginationOptions } = usePaginationLocalStorage<VulnerabilitiesLinesPaginationQuery$variables>(
     'view-vulnerabilities',
     {
@@ -65,7 +68,7 @@ const Vulnerabilities = () => {
       creator: {
         label: 'Creators',
         width: '12%',
-        isSortable: true,
+        isSortable: isRuntimeSort,
       },
     };
 

diff --git a/opencti-platform/opencti-front/src/private/components/cases/Feedbacks.tsx b/opencti-platform/opencti-front/src/private/components/cases/Feedbacks.tsx
@@ -70,7 +70,7 @@ const Feedbacks: FunctionComponent<CasesProps> = () => {
       openExports,
       numberOfElements,
     } = viewStorage;
-    const isRuntimeSort = helper?.isRuntimeFieldEnable();
+    const isRuntimeSort = helper?.isRuntimeFieldEnable() ?? false;
     const dataColumns = {
       name: {
         label: 'Name',
@@ -85,12 +85,12 @@ const Feedbacks: FunctionComponent<CasesProps> = () => {
       createdBy: {
         label: 'Author',
         width: '12%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       creator: {
         label: 'Creators',
         width: '12%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       objectLabel: {
         label: 'Labels',
@@ -110,7 +110,7 @@ const Feedbacks: FunctionComponent<CasesProps> = () => {
       objectMarking: {
         label: 'Marking',
         width: '8%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
     };
     const queryRef = useQueryLoading<FeedbacksLinesPaginationQuery>(

diff --git a/opencti-platform/opencti-front/src/private/components/cases/Incidents.tsx b/opencti-platform/opencti-front/src/private/components/cases/Incidents.tsx
@@ -73,7 +73,7 @@ const Incidents: FunctionComponent<CasesProps> = () => {
       openExports,
       numberOfElements,
     } = viewStorage;
-    const isRuntimeSort = helper?.isRuntimeFieldEnable();
+    const isRuntimeSort = helper?.isRuntimeFieldEnable() ?? false;
     const dataColumns = {
       name: {
         label: 'Name',
@@ -93,12 +93,12 @@ const Incidents: FunctionComponent<CasesProps> = () => {
       createdBy: {
         label: 'Author',
         width: '11%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       creator: {
         label: 'Creators',
         width: '11%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       objectLabel: {
         label: 'Labels',
@@ -118,7 +118,7 @@ const Incidents: FunctionComponent<CasesProps> = () => {
       objectMarking: {
         label: 'Marking',
         width: '8%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
     };
     const queryRef = useQueryLoading<IncidentsLinesCasesPaginationQuery>(

diff --git a/.../opencti-front/src/private/components/common/containers/ContainerStixCyberObservables.tsx b/.../opencti-front/src/private/components/common/containers/ContainerStixCyberObservables.tsx
@@ -232,7 +232,7 @@ const ContainerStixCyberObservablesComponent: FunctionComponent<ContainerStixCyb
   };
 
   const buildColumns = (helper: ModuleHelper | undefined) => {
-    const isRuntimeSort = helper?.isRuntimeFieldEnable();
+    const isRuntimeSort = helper?.isRuntimeFieldEnable() ?? false;
     return {
       entity_type: {
         label: 'Type',
@@ -242,7 +242,7 @@ const ContainerStixCyberObservablesComponent: FunctionComponent<ContainerStixCyb
       observable_value: {
         label: 'Value',
         width: '30%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       objectLabel: {
         label: 'Labels',
@@ -252,7 +252,7 @@ const ContainerStixCyberObservablesComponent: FunctionComponent<ContainerStixCyb
       createdBy: {
         label: 'Creator',
         width: '15%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       created_at: {
         label: 'Creation date',
@@ -261,7 +261,7 @@ const ContainerStixCyberObservablesComponent: FunctionComponent<ContainerStixCyb
       },
       objectMarking: {
         label: 'Marking',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
     };
   };

diff --git a/...ront/src/private/components/common/containers/ContainerStixObjectsOrStixRelationships.tsx b/...ront/src/private/components/common/containers/ContainerStixObjectsOrStixRelationships.tsx
@@ -58,7 +58,7 @@ ContainerStixObjectsOrStixRelationshipsComponentProps
     security.push(KNOWLEDGE_KNPARTICIPATE);
   }
   const { helper } = useContext(UserContext);
-  const isRuntimeSort = helper?.isRuntimeFieldEnable();
+  const isRuntimeSort = helper?.isRuntimeFieldEnable() ?? false;
   const dataColumns = {
     entity_type: {
       label: 'Type',
@@ -73,12 +73,12 @@ ContainerStixObjectsOrStixRelationshipsComponentProps
     createdBy: {
       label: 'Author',
       width: '12%',
-      isSortable: isRuntimeSort ?? false,
+      isSortable: isRuntimeSort,
     },
     creator: {
       label: 'Creator',
       width: '12%',
-      isSortable: isRuntimeSort ?? false,
+      isSortable: isRuntimeSort,
     },
     objectLabel: {
       label: 'Labels',
@@ -92,7 +92,7 @@ ContainerStixObjectsOrStixRelationshipsComponentProps
     },
     objectMarking: {
       label: 'Marking',
-      isSortable: isRuntimeSort ?? false,
+      isSortable: isRuntimeSort,
       width: '8%',
     },
   };

diff --git a/...rc/private/components/common/containers/StixCoreObjectOrStixCoreRelationshipContainers.js b/...rc/private/components/common/containers/StixCoreObjectOrStixCoreRelationshipContainers.js
@@ -175,7 +175,7 @@ class StixCoreObjectOrStixCoreRelationshipContainers extends Component {
 
   // eslint-disable-next-line class-methods-use-this
   buildColumns(helper) {
-    const isRuntimeSort = helper.isRuntimeFieldEnable();
+    const isRuntimeSort = helper.isRuntimeFieldEnable() ?? false;
     return {
       entity_type: {
         label: 'Type',
@@ -190,12 +190,12 @@ class StixCoreObjectOrStixCoreRelationshipContainers extends Component {
       createdBy: {
         label: 'Author',
         width: '12%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       creator: {
         label: 'Creators',
         width: '12%',
-        isSortable: isRuntimeSort ?? false,
+        isSortable: isRuntimeSort,
       },
       objectLabel: {
         label: 'Labels',

diff --git a/opencti-platform/opencti-front/src/private/components/data/Relationships.js b/opencti-platform/opencti-front/src/private/components/data/Relationships.js
@@ -214,7 +214,7 @@ class Relationships extends Component {
       creator: {
         label: 'Creators',
         width: '7%',
-        isSortable: true,
+        isSortable: isRuntimeSort,
       },
       created_at: {
         label: 'Creation date',