[frontend] Fix remaining button when fab is not replaced

OpenCTI-Platform · Sep 17, 2024 · 558e6c1 · 558e6c1
1 parent e965f3b
commit 558e6c1
Show file tree

Hide file tree

Showing 29 changed files with 157 additions and 75 deletions.
diff --git a/...m/opencti-front/src/private/components/analyses/external_references/ExternalReference.tsx b/...m/opencti-front/src/private/components/analyses/external_references/ExternalReference.tsx
@@ -49,9 +49,9 @@ ExternalReferenceComponentProps
       <ExternalReferenceHeader
         externalReference={externalReference}
         PopoverComponent={
-          <ExternalReferencePopover id={''} handleRemove={undefined} />
+          <ExternalReferencePopover id={externalReference.id} handleRemove={undefined} />
         }
-        EditComponent={(
+        EditComponent={isFABReplaced && (
           <Security needs={[KNOWLEDGE_KNUPDATE]}>
             <ExternalReferenceEdition externalReferenceId={externalReference.id} />
           </Security>
@@ -62,42 +62,41 @@ ExternalReferenceComponentProps
         spacing={3}
         classes={{ container: classes.gridContainer }}
       >
-        {
-          overviewLayoutCustomization.map(({ key, width }) => {
-            switch (key) {
-              case 'basicInformation':
-                return (
-                  <Grid key={key} item xs={width}>
-                    <ExternalReferenceOverview externalReference={externalReference} />
-                  </Grid>
-                );
-              case 'details':
-                return (
-                  <Grid key={key} item xs={width}>
-                    <ExternalReferenceDetails externalReference={externalReference} />
-                  </Grid>
-                );
-              case 'linkedObjects':
-                return (
-                  <Grid key={key} item xs={width}>
-                    <ExternalReferenceStixCoreObjects
-                      externalReference={externalReference}
-                    />
-                  </Grid>
-                );
-              case 'uploadedFiles':
-                return (
-                  <Grid key={key} item xs={width}>
-                    <ExternalReferenceFileImportViewer
-                      externalReference={externalReference}
-                      connectorsImport={connectorsImport}
-                    />
-                  </Grid>
-                );
-              default:
-                return null;
-            }
-          })
+        {overviewLayoutCustomization.map(({ key, width }) => {
+          switch (key) {
+            case 'basicInformation':
+              return (
+                <Grid key={key} item xs={width}>
+                  <ExternalReferenceOverview externalReference={externalReference} />
+                </Grid>
+              );
+            case 'details':
+              return (
+                <Grid key={key} item xs={width}>
+                  <ExternalReferenceDetails externalReference={externalReference} />
+                </Grid>
+              );
+            case 'linkedObjects':
+              return (
+                <Grid key={key} item xs={width}>
+                  <ExternalReferenceStixCoreObjects
+                    externalReference={externalReference}
+                  />
+                </Grid>
+              );
+            case 'uploadedFiles':
+              return (
+                <Grid key={key} item xs={width}>
+                  <ExternalReferenceFileImportViewer
+                    externalReference={externalReference}
+                    connectorsImport={connectorsImport}
+                  />
+                </Grid>
+              );
+            default:
+              return null;
+          }
+        })
         }
       </Grid>
       {!isFABReplaced && (

diff --git a/...cti-front/src/private/components/analyses/external_references/ExternalReferenceHeader.tsx b/...cti-front/src/private/components/analyses/external_references/ExternalReferenceHeader.tsx
@@ -22,7 +22,7 @@ const useStyles = makeStyles(() => ({
 interface ExternalReferenceHeaderComponentProps {
   externalReference: ExternalReferenceHeader_externalReference$data;
   PopoverComponent: ReactElement<{ id: string }>;
-  EditComponent?: React.JSX.Element;
+  EditComponent?: React.JSX.Element | boolean;
 }
 
 const ExternalReferenceHeaderComponent: FunctionComponent<ExternalReferenceHeaderComponentProps> = ({ externalReference, PopoverComponent, EditComponent }) => {

diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/Grouping.jsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/Grouping.jsx
@@ -141,6 +141,7 @@ export default createFragmentContainer(GroupingComponent, {
         }
       }
       workflowEnabled
+      currentUserAccessRight
       ...GroupingDetails_grouping
       ...ContainerHeader_container
     }

diff --git a/...form/opencti-front/src/private/components/analyses/groupings/GroupingEditionContainer.jsx b/...form/opencti-front/src/private/components/analyses/groupings/GroupingEditionContainer.jsx
@@ -13,7 +13,6 @@ const GroupingEditionContainer = (props) => {
 
   const { handleClose, grouping, open, controlledDial } = props;
   const { editContext } = grouping;
-
   return (
     <Drawer
       title={t_i18n('Update a grouping')}

diff --git a/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx b/opencti-platform/opencti-front/src/private/components/analyses/groupings/Root.tsx
@@ -30,6 +30,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE, KNOWLEDGE_KNUPDATE }
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import GroupingEdition from './GroupingEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootGroupingSubscription($id: ID!) {
@@ -89,6 +90,8 @@ const RootGrouping = () => {
     [groupingId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Grouping') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -115,8 +118,10 @@ const RootGrouping = () => {
                   />
                   <ContainerHeader
                     container={grouping}
-                    PopoverComponent={<GroupingPopover />}
-                    EditComponent={(
+                    PopoverComponent={
+                      <GroupingPopover id={groupingId} />
+                    }
+                    EditComponent={isFABReplaced && (
                       <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
                         <GroupingEdition groupingId={grouping.id} />
                       </Security>

diff --git a/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx b/opencti-platform/opencti-front/src/private/components/analyses/malware_analyses/Root.tsx
@@ -29,6 +29,7 @@ import Breadcrumbs from '../../../../components/Breadcrumbs';
 import { getMainRepresentative } from '../../../../utils/defaultRepresentatives';
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import MalwareAnalysisEdition from './MalwareAnalysisEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootMalwareAnalysisSubscription($id: ID!) {
@@ -79,6 +80,8 @@ const RootMalwareAnalysis = () => {
     [malwareAnalysisId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
   const link = `/dashboard/analyses/malware_analyses/${malwareAnalysisId}/knowledge`;
@@ -106,7 +109,7 @@ const RootMalwareAnalysis = () => {
                     PopoverComponent={
                       <MalwareAnalysisPopover id={malwareAnalysisId} />
                     }
-                    EditComponent={(
+                    EditComponent={isFABReplaced && (
                       <Security needs={[KNOWLEDGE_KNUPDATE]}>
                         <MalwareAnalysisEdition malwareAnalysisId={malwareAnalysis.id} />
                       </Security>

diff --git a/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.tsx b/opencti-platform/opencti-front/src/private/components/arsenal/vulnerabilities/Root.tsx
@@ -139,10 +139,10 @@ const RootVulnerability = ({ queryRef, vulnerabilityId }: RootVulnerabilityProps
             <StixDomainObjectHeader
               entityType="Vulnerability"
               stixDomainObject={vulnerability}
-              PopoverComponent={<VulnerabilityPopover />}
+              PopoverComponent={<VulnerabilityPopover id={vulnerabilityId} />}
               EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
-                  <VulnerabilityEdition vulnerabilityId={vulnerability.id} />
+                  <VulnerabilityEdition vulnerabilityId={vulnerabilityId} />
                 </Security>
               )}
               enableQuickSubscription={true}

diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_incidents/Root.tsx
@@ -32,6 +32,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE, KNOWLEDGE_KNUPDATE }
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import CaseIncidentEdition from './CaseIncidentEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootIncidentCaseSubscription($id: ID!) {
@@ -89,6 +90,8 @@ const RootCaseIncidentComponent = ({ queryRef, caseId }) => {
     [caseId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Case-Incident') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -116,11 +119,11 @@ const RootCaseIncidentComponent = ({ queryRef, caseId }) => {
       <ContainerHeader
         container={caseData}
         PopoverComponent={<CaseIncidentPopover id={caseData.id} />}
-        EditComponent={
+        EditComponent={isFABReplaced && (
           <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
             <CaseIncidentEdition caseId={caseData.id} />
           </Security>
-        }
+        )}
         enableQuickSubscription={true}
         enableAskAi={true}
         redirectToContent={true}

diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfis/Root.tsx
@@ -31,6 +31,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE, KNOWLEDGE_KNUPDATE }
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import CaseRfiEdition from './CaseRfiEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootCaseRfiCaseSubscription($id: ID!) {
@@ -86,6 +87,8 @@ const RootCaseRfiComponent = ({ queryRef, caseId }) => {
     [caseId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Case-Rfi') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -111,9 +114,11 @@ const RootCaseRfiComponent = ({ queryRef, caseId }) => {
       <ContainerHeader
         container={caseData}
         PopoverComponent={<CaseRfiPopover id={caseData.id} />}
-        EditComponent={<Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
+        EditComponent={isFABReplaced && (
+        <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
           <CaseRfiEdition caseId={caseData.id} />
-        </Security>}
+        </Security>
+        )}
         enableQuickSubscription={true}
         enableAskAi={true}
         redirectToContent={true}

diff --git a/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/case_rfts/Root.tsx
@@ -30,6 +30,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE, KNOWLEDGE_KNUPDATE }
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import CaseRftEdition from './CaseRftEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootCaseRftCaseSubscription($id: ID!) {
@@ -85,6 +86,8 @@ const RootCaseRftComponent = ({ queryRef, caseId }) => {
     [caseId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Case-Rft') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -110,9 +113,11 @@ const RootCaseRftComponent = ({ queryRef, caseId }) => {
       <ContainerHeader
         container={caseData}
         PopoverComponent={<CaseRftPopover id={caseData.id} />}
-        EditComponent={<Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
+        EditComponent={isFABReplaced && (
+        <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={currentAccessRight.canEdit}>
           <CaseRftEdition caseId={caseData.id} />
-        </Security>}
+        </Security>
+        )}
         enableQuickSubscription={true}
         enableAskAi={true}
         redirectToContent={true}

diff --git a/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/feedbacks/Root.tsx
@@ -30,6 +30,7 @@ import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE } from '../../../../ut
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import FeedbackEdition from './FeedbackEdition';
 import { useGetCurrentUserAccessRight } from '../../../../utils/authorizedMembers';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootFeedbackSubscription($id: ID!) {
@@ -91,6 +92,8 @@ const RootFeedbackComponent = ({ queryRef, caseId }) => {
     [caseId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Feedback') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -116,9 +119,11 @@ const RootFeedbackComponent = ({ queryRef, caseId }) => {
       <ContainerHeader
         container={feedbackData}
         PopoverComponent={<FeedbackPopover id={feedbackData.id} />}
-        EditComponent={<Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={canEdit}>
+        EditComponent={isFABReplaced && (
+        <Security needs={[KNOWLEDGE_KNUPDATE]} hasAccess={canEdit}>
           <FeedbackEdition feedbackId={feedbackData.id} />
-        </Security>}
+        </Security>
+        )}
         enableSuggestions={false}
         disableSharing={true}
         enableQuickSubscription

diff --git a/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx b/opencti-platform/opencti-front/src/private/components/cases/tasks/Root.tsx
@@ -28,6 +28,7 @@ import { useIsEnforceReference } from '../../../../utils/hooks/useEntitySettings
 import useGranted, { KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE } from '../../../../utils/hooks/useGranted';
 import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import TaskEdition from './TaskEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootTaskSubscription($id: ID!) {
@@ -75,6 +76,8 @@ const RootTaskComponent = ({ queryRef, taskId }) => {
     [taskId],
   );
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const enableReferences = useIsEnforceReference('Task') && !useGranted([KNOWLEDGE_KNUPDATE_KNBYPASSREFERENCE]);
   const { t_i18n } = useFormatter();
   useSubscription(subConfig);
@@ -97,9 +100,11 @@ const RootTaskComponent = ({ queryRef, taskId }) => {
           <ContainerHeader
             container={data}
             PopoverComponent={<TasksPopover id={data.id} />}
-            EditComponent={<Security needs={[KNOWLEDGE_KNUPDATE]}>
-              <TaskEdition caseId={data.id} />
-            </Security>}
+            EditComponent={isFABReplaced && (
+              <Security needs={[KNOWLEDGE_KNUPDATE]}>
+                <TaskEdition caseId={data.id} />
+              </Security>
+            )}
             enableSuggestions={false}
             redirectToContent={true}
             disableAuthorizedMembers={true}

diff --git a/opencti-platform/opencti-front/src/private/components/entities/events/Root.tsx b/opencti-platform/opencti-front/src/private/components/entities/events/Root.tsx
@@ -27,6 +27,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
 import EventEdition from './EventEdition';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootEventsSubscription($id: ID!) {
@@ -83,6 +84,8 @@ const RootEvent = ({ eventId, queryRef }: RootEventProps) => {
   }), [eventId]);
 
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
   const { t_i18n } = useFormatter();
   useSubscription<RootEventsSubscription>(subConfig);
 
@@ -135,7 +138,7 @@ const RootEvent = ({ eventId, queryRef }: RootEventProps) => {
               stixDomainObject={event}
               enableQuickSubscription={true}
               PopoverComponent={<EventPopover />}
-              EditComponent={(
+              EditComponent={isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <EventEdition eventId={event.id} />
                 </Security>

diff --git a/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.tsx b/opencti-platform/opencti-front/src/private/components/entities/individuals/Root.tsx
@@ -29,6 +29,7 @@ import { getCurrentTab, getPaddingRight } from '../../../../utils/utils';
 import IndividualEdition from './IndividualEdition';
 import Security from '../../../../utils/Security';
 import { KNOWLEDGE_KNUPDATE } from '../../../../utils/hooks/useGranted';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 const subscription = graphql`
   subscription RootIndividualsSubscription($id: ID!) {
@@ -87,6 +88,9 @@ const RootIndividual = ({ individualId, queryRef }: RootIndividualProps) => {
     variables: { id: individualId },
   }), [individualId]);
   const location = useLocation();
+  const { isFeatureEnable } = useHelper();
+  const isFABReplaced = isFeatureEnable('FAB_REPLACEMENT');
+
   const navigate = useNavigate();
   const LOCAL_STORAGE_KEY = `individual-${individualId}`;
   const params = buildViewParamsFromUrlAndStorage(
@@ -169,7 +173,7 @@ const RootIndividual = ({ individualId, queryRef }: RootIndividualProps) => {
               isOpenctiAlias={true}
               enableQuickSubscription={true}
               PopoverComponent={<IndividualPopover />}
-              EditComponent={!individual.isUser && (
+              EditComponent={!individual.isUser && isFABReplaced && (
                 <Security needs={[KNOWLEDGE_KNUPDATE]}>
                   <IndividualEdition individualId={individual.id} />
                 </Security>