[frontend] import and translation fixed, session storage logic remove…

…d from component (#3167)

opencti-platform/opencti-front/lang/back/fr.json

@@ -630,5 +630,5 @@
   "Entity ID": "ID de l'entité",
   "Source connector": "Connecteur source",
   "Malware analysis operating System": "Système d'exploitation pour l'analyse des logiciels malveillants",
-  "Allowed markings": "Marques autorisées"
+  "Allowed markings": "Marquages autorisés"
 }

opencti-platform/opencti-front/src/private/components/workspaces/investigations/Dialog/InvestigationRollBackExpandDialog.tsx

@@ -4,7 +4,8 @@ import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
 import DialogActions from '@mui/material/DialogActions';
 import Button from '@mui/material/Button';
-import { useFormatter } from 'src/components/i18n';
+import { getPreExpansionStateList } from '../utils/investigationStorage';
+import { useFormatter } from '../../../../../components/i18n';
 
 type InvestigationRollBackExpandDialogProps = {
   closeDialog: () => void;
@@ -21,7 +22,7 @@ const InvestigationRollBackExpandDialog = ({ closeDialog, handleRollBackToPreExp
   };
 
   const getLastRollBackExpandDate = () => {
-    const storedPreExpansion = sessionStorage.getItem('preExpansionStateList');
+    const storedPreExpansion = getPreExpansionStateList();
     if (storedPreExpansion) {
       return fldt(JSON.parse(storedPreExpansion)[0].dateTime);
     }

opencti-platform/opencti-front/src/private/components/workspaces/investigations/InvestigationGraph.jsx

@@ -11,6 +11,7 @@ import { withRouter } from 'react-router-dom';
 import { Subject, timer } from 'rxjs';
 import { debounce } from 'rxjs/operators';
 import SpriteText from 'three-spritetext';
+import { getPreExpansionStateList, investigationPreExpansionStateListStorageKey, updatePreExpansionStateList } from './utils/investigationStorage';
 import InvestigationRollBackExpandDialog from './Dialog/InvestigationRollBackExpandDialog';
 import withRouter from '../../../../utils/compat-router/withRouter';
 import InvestigationExpandForm from './InvestigationExpandForm';
@@ -1838,7 +1839,7 @@ class InvestigationGraphComponent extends Component {
     }
     if (newElementsIds.length > 0) {
       setStackDataInSessionStorage(
-        'preExpansionStateList',
+        investigationPreExpansionStateListStorageKey,
         {
           dateTime: new Date().getTime(),
           investigatedEntitiesIdsList: newElementsIds,
@@ -1891,7 +1892,7 @@ class InvestigationGraphComponent extends Component {
   }
 
   handleRollBackToPreExpansionState() {
-    const storedPreExpansion = sessionStorage.getItem('preExpansionStateList');
+    const storedPreExpansion = getPreExpansionStateList();
     if (storedPreExpansion) {
       const currentStoredPreExpansion = JSON.parse(storedPreExpansion);
       const { investigatedEntitiesIdsList } = currentStoredPreExpansion[0];
@@ -1928,12 +1929,7 @@ class InvestigationGraphComponent extends Component {
             ),
           });
 
-          currentStoredPreExpansion.shift();
-          if (currentStoredPreExpansion.length === 0) {
-            sessionStorage.removeItem('preExpansionStateList');
-          } else {
-            sessionStorage.setItem('preExpansionStateList', JSON.stringify(currentStoredPreExpansion));
-          }
+          updatePreExpansionStateList(currentStoredPreExpansion);
         },
       });
     }

opencti-platform/opencti-front/src/private/components/workspaces/investigations/InvestigationGraphBar.jsx

@@ -39,6 +39,7 @@ import * as R from 'ramda';
 import React, { Component } from 'react';
 import TimeRange from 'react-timeline-range-slider';
 import { ResponsiveContainer, Scatter, ScatterChart, YAxis, ZAxis } from 'recharts';
+import { getPreExpansionStateList } from './utils/investigationStorage';
 import InvestigationAddStixCoreObjects from './InvestigationAddStixCoreObjects';
 import inject18n from '../../../../components/i18n';
 import SearchInput from '../../../../components/SearchInput';
@@ -355,7 +356,7 @@ class InvestigationGraphBar extends Component {
     }
     const stixCoreObjectOrRelationshipId = (selectedNodes[0]?.id ?? null) || (selectedLinks[0]?.id ?? null);
 
-    const isRollBackToLastPreExpansionStateEnabled = !sessionStorage.getItem('preExpansionStateList');
+    const isRollBackToLastPreExpansionStateEnabled = !getPreExpansionStateList();
 
     return (
       <UserContext.Consumer>

opencti-platform/opencti-front/src/private/components/workspaces/investigations/utils/investigationStorage.ts

@@ -0,0 +1,16 @@
+export const investigationPreExpansionStateListStorageKey = 'preExpansionStateList';
+
+type UpdatePreExpansionStateParamsType = Array<{
+  dateTime: number;
+  investigatedEntitiesIdsList: string[];
+}>;
+export const getPreExpansionStateList = () => sessionStorage.getItem(investigationPreExpansionStateListStorageKey);
+
+export const updatePreExpansionStateList = (preExpansionStateList: UpdatePreExpansionStateParamsType) => {
+  preExpansionStateList.shift();
+  if (preExpansionStateList.length === 0) {
+    sessionStorage.removeItem(investigationPreExpansionStateListStorageKey);
+  } else {
+    sessionStorage.setItem(investigationPreExpansionStateListStorageKey, JSON.stringify(preExpansionStateList));
+  }
+};