[frontend] linter fixed, session storage function updated, some var n…

…ames edited (#3167)
OpenCTI-Platform · Mar 27, 2024 · a2fd08f · a2fd08f
1 parent f343632
commit a2fd08f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 32 deletions.
diff --git a/...private/components/workspaces/investigations/Dialog/InvestigationRollBackExpandDialog.tsx b/...private/components/workspaces/investigations/Dialog/InvestigationRollBackExpandDialog.tsx
@@ -9,10 +9,10 @@ import { useFormatter } from 'src/components/i18n';
 type InvestigationRollBackExpandDialogProps = {
   closeDialog: () => void;
   handleRollBackToPreExpansionState: () => void;
-  isRollBackPreExpandStateDialogOpen: boolean;
+  isOpen: boolean;
 };
 
-const InvestigationRollBackExpandDialog = ({ closeDialog, handleRollBackToPreExpansionState, isRollBackPreExpandStateDialogOpen }: InvestigationRollBackExpandDialogProps) => {
+const InvestigationRollBackExpandDialog = ({ closeDialog, handleRollBackToPreExpansionState, isOpen }: InvestigationRollBackExpandDialogProps) => {
   const { t_i18n, fldt } = useFormatter();
 
   const handleSubmit = () => {
@@ -31,7 +31,7 @@ const InvestigationRollBackExpandDialog = ({ closeDialog, handleRollBackToPreExp
   return (
     <Dialog
       PaperProps={{ elevation: 1 }}
-      open={isRollBackPreExpandStateDialogOpen}
+      open={isOpen}
       onClose={closeDialog}
       fullWidth={true}
       maxWidth="sm"

diff --git a/...orm/opencti-front/src/private/components/workspaces/investigations/InvestigationGraph.jsx b/...orm/opencti-front/src/private/components/workspaces/investigations/InvestigationGraph.jsx
@@ -1837,12 +1837,14 @@ class InvestigationGraphComponent extends Component {
       this.fetchObjectRelCounts(newElements);
     }
     if (newElementsIds.length > 0) {
-      setStackDataInSessionStorage({ valueToStore: {
-        dateTime: new Date().getTime(),
-        investigatedEntitiesIdsList: newElementsIds,
-      },
-      key: 'preExpansionStateList',
-      stackValue: 10 });
+      setStackDataInSessionStorage(
+        'preExpansionStateList',
+        {
+          dateTime: new Date().getTime(),
+          newElementsIds,
+        },
+        2,
+      );
 
       this.graphData = buildGraphData(
         this.graphObjects,
@@ -2083,7 +2085,7 @@ class InvestigationGraphComponent extends Component {
               </Dialog>
 
               <InvestigationRollBackExpandDialog
-                isRollBackPreExpandStateDialogOpen={isRollBackPreExpandStateDialogOpen}
+                isOpen={isRollBackPreExpandStateDialogOpen}
                 closeDialog={this.handleCloseRollBackToPreExpansionStateDialog.bind(this)}
                 handleRollBackToPreExpansionState={this.handleRollBackToPreExpansionState.bind(this)}
               />

diff --git a/.../opencti-front/src/private/components/workspaces/investigations/InvestigationGraphBar.jsx b/.../opencti-front/src/private/components/workspaces/investigations/InvestigationGraphBar.jsx
@@ -872,10 +872,15 @@ class InvestigationGraphBar extends Component {
                       )}
                       <Tooltip title={t('Restore the state of the graphic before the last expansion')}>
                         <span>
-                          <IconButton color="primary" onClick={handleOpenRollBackToPreExpansionStateDialog} size="large" disabled={isRollBackToLastPreExpansionStateEnabled}>
-                            <Undo />
-                          </IconButton>
                         </span>
+                        <IconButton
+                          color="primary"
+                          disabled={isRollBackToLastPreExpansionStateEnabled}
+                          onClick={handleOpenRollBackToPreExpansionStateDialog}
+                          size="large"
+                        >
+                          <Undo />
+                        </IconButton>
                       </Tooltip>
                       <Tooltip title={t('Expand')}>
                         <span>

diff --git a/...rc/utils/sessionStorage/setStackDataInSessionStorage/setStackDataInSessionStorage.test.ts b/...rc/utils/sessionStorage/setStackDataInSessionStorage/setStackDataInSessionStorage.test.ts
@@ -12,15 +12,11 @@ describe('Session Storage', () => {
 
     describe('When I set a data in session storage', () => {
       beforeEach(() => {
-        setStackDataInSessionStorage({
-          valueToStore: { test: 'value1' },
-          key: testKey,
-          stackValue,
-        });
+        setStackDataInSessionStorage(testKey, { test: 'value1' }, stackValue);
       });
 
       describe('If I get datas with my key from session storage', () => {
-        it('contains the my value', () => {
+        it('contains my value', () => {
           const storedData = sessionStorage.getItem('testKey');
           expect(storedData).to.not.equal(null);
 
@@ -35,11 +31,7 @@ describe('Session Storage', () => {
     describe('When I set three data in session storage with a stack value of 2', () => {
       beforeEach(() => {
         Array.from(Array(3).keys()).forEach((_, i) => {
-          setStackDataInSessionStorage({
-            valueToStore: { test: `value${i}` },
-            key: testKey,
-            stackValue,
-          });
+          setStackDataInSessionStorage(testKey, { test: `value${i}` }, stackValue);
         });
       });
 

diff --git a/...ont/src/utils/sessionStorage/setStackDataInSessionStorage/setStackDataInSessionStorage.ts b/...ont/src/utils/sessionStorage/setStackDataInSessionStorage/setStackDataInSessionStorage.ts
@@ -1,17 +1,12 @@
-type SetDataOnSessionStorageParams = {
-  valueToStore: unknown;
-  key: string;
-  stackValue: number;
-};
-const setStackDataInSessionStorage = ({ valueToStore, key, stackValue }: SetDataOnSessionStorageParams): void => {
+const setStackDataInSessionStorage = (key: string, valueToStore: unknown, stackValue: number): void => {
   const storedStackData = sessionStorage.getItem(key);
   const currentStoredStackData = storedStackData ? JSON.parse(storedStackData) : [];
 
   currentStoredStackData.unshift(valueToStore);
 
-  if (currentStoredStackData.length > stackValue) currentStoredStackData.pop();
+  const newStackDataToStore = currentStoredStackData.slice(0, stackValue);
 
-  sessionStorage.setItem(key, JSON.stringify(currentStoredStackData));
+  sessionStorage.setItem(key, JSON.stringify(newStackDataToStore));
 };
 
 export default setStackDataInSessionStorage;