[frontend] move trash page to root menu level

OpenCTI-Platform · Apr 4, 2024 · 628766e · 628766e
1 parent 98b3b57
commit 628766e
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 14 deletions.
diff --git a/opencti-platform/opencti-front/src/private/Index.tsx b/opencti-platform/opencti-front/src/private/Index.tsx
@@ -30,6 +30,7 @@ const RootTechnique = lazy(() => import('./components/techniques/Root'));
 const RootEntities = lazy(() => import('./components/entities/Root'));
 const RootLocation = lazy(() => import('./components/locations/Root'));
 const RootData = lazy(() => import('./components/data/Root'));
+const RootTrash = lazy(() => import('./components/trash/Root'));
 const RootWorkspaces = lazy(() => import('./components/workspaces/Root'));
 const RootSettings = lazy(() => import('./components/settings/Root'));
 const RootActivity = lazy(() => import('./components/settings/activity/Root'));
@@ -140,6 +141,7 @@ const Index = ({ settings }: IndexProps) => {
                 component={RootLocation}
               />
               <BoundaryRoute path="/dashboard/data" component={RootData} />
+              <BoundaryRoute path="/dashboard/trash" component={RootTrash} />
               <BoundaryRoute
                 path="/dashboard/workspaces"
                 component={RootWorkspaces}

diff --git a/opencti-platform/opencti-front/src/private/components/data/Root.jsx b/opencti-platform/opencti-front/src/private/components/data/Root.jsx
@@ -9,7 +9,6 @@ const Security = lazy(() => import('../../../utils/Security'));
 const Connectors = lazy(() => import('./Connectors'));
 const IngestionCsv = lazy(() => import('./IngestionCsv'));
 const Entities = lazy(() => import('./Entities'));
-const Trash = lazy(() => import('./Trash'));
 const Relationships = lazy(() => import('./Relationships'));
 const Tasks = lazy(() => import('./Tasks'));
 const Taxii = lazy(() => import('./Taxii'));
@@ -42,11 +41,6 @@ const Root = () => {
           path="/dashboard/data/relationships"
           component={Relationships}
         />
-        <BoundaryRoute
-          exact
-          path="/dashboard/data/trash"
-          component={Trash}
-        />
         <BoundaryRoute
           exact
           path="/dashboard/data/ingestion"

diff --git a/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx b/opencti-platform/opencti-front/src/private/components/nav/LeftBar.jsx
@@ -19,6 +19,7 @@ import {
   ChevronRight,
   ConstructionOutlined,
   DashboardOutlined,
+  DeleteOutlined,
   DescriptionOutlined,
   DiamondOutlined,
   DomainOutlined,
@@ -808,14 +809,33 @@ const LeftBar = () => {
                 [
                   { granted: isGrantedToKnowledge, link: '/dashboard/data/entities', label: 'Entities' },
                   { granted: isGrantedToKnowledge, link: '/dashboard/data/relationships', label: 'Relationships' },
-                  { granted: isGrantedToKnowledge, link: '/dashboard/data/trash', label: 'Trash' },
                   { granted: isGrantedToIngestion, link: '/dashboard/data/ingestion', label: 'Ingestion' },
                   { granted: isGrantedToImport, link: '/dashboard/data/import', label: 'Import' },
                   { granted: isGrantedToProcessing, link: '/dashboard/data/processing', label: 'Processing' },
                   { granted: isGrantedToSharing, link: '/dashboard/data/sharing', label: 'Data sharing' },
                 ],
               )}
             </Security>
+            {/* TODO: <SECURITY> check */}
+            <StyledTooltip title={!navOpen && t_i18n('Trash')} placement="right">
+              <MenuItem
+                component={Link}
+                to="/dashboard/trash/all"
+                selected={!navOpen && location.pathname.includes('/dashboard/trash/all')}
+                dense={true}
+                classes={{ root: classes.menuItem }}
+              >
+                <ListItemIcon classes={{ root: classes.menuItemIcon }} style={{ minWidth: 20 }}>
+                  <DeleteOutlined />
+                </ListItemIcon>
+                {navOpen && (
+                  <ListItemText
+                    classes={{ primary: classes.menuItemText }}
+                    primary={t_i18n('Trash')}
+                  />
+                )}
+              </MenuItem>
+            </StyledTooltip>
           </MenuList>
         </Security>
         <Security needs={[SETTINGS, MODULES, KNOWLEDGE, TAXIIAPI_SETCOLLECTIONS]}>

diff --git a/opencti-platform/opencti-front/src/private/components/trash/Root.tsx b/opencti-platform/opencti-front/src/private/components/trash/Root.tsx
@@ -0,0 +1,23 @@
+import React, { Suspense, lazy } from 'react';
+import { Switch } from 'react-router-dom';
+import { BoundaryRoute } from '../Error';
+import Loader from '../../../components/Loader';
+
+const Trash = lazy(() => import('./Trash'));
+
+const Root = () => {
+  // TODO: <SECURITY> check
+  return (
+    <Suspense fallback={<Loader />}>
+      <Switch>
+        <BoundaryRoute
+          exact
+          path="/dashboard/trash/all"
+          component={Trash}
+        />
+      </Switch>
+    </Suspense>
+  );
+};
+
+export default Root;
diff --git a/...ont/src/private/components/data/Trash.tsx → ...nt/src/private/components/trash/Trash.tsx b/...ont/src/private/components/data/Trash.tsx → ...nt/src/private/components/trash/Trash.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
-import DeleteOperationsLines, { deleteOperationsLinesQuery } from '@components/data/trash/DeleteOperationsLines';
-import { DeleteOperationLineDummy } from '@components/data/trash/DeleteOperationLine';
+import DeleteOperationsLines, { deleteOperationsLinesQuery } from '@components/trash/all/DeleteOperationsLines';
+import { DeleteOperationLineDummy } from '@components/trash/all/DeleteOperationLine';
 import ListLines from '../../../components/list_lines/ListLines';
 import ExportContextProvider from '../../../utils/ExportContextProvider';
 import { usePaginationLocalStorage } from '../../../utils/hooks/useLocalStorage';
 import useQueryLoading from '../../../utils/hooks/useQueryLoading';
 import { emptyFilterGroup } from '../../../utils/filters/filtersUtils';
 import { useFormatter } from '../../../components/i18n';
 import Breadcrumbs from '../../../components/Breadcrumbs';
-import type { DeleteOperationsLinesPaginationQuery, DeleteOperationsLinesPaginationQuery$variables } from './trash/__generated__/DeleteOperationsLinesPaginationQuery.graphql';
+import type { DeleteOperationsLinesPaginationQuery, DeleteOperationsLinesPaginationQuery$variables } from './all/__generated__/DeleteOperationsLinesPaginationQuery.graphql';
 import { DataColumns } from '../../../components/list_lines';
 
 const LOCAL_STORAGE_KEY = 'trash';
@@ -45,12 +45,12 @@ const Trash: React.FC = () => {
   const renderLines = () => {
     const dataColumns: DataColumns = {
       main_entity_type: {
-        label: 'Type',
+        label: 'Element Type',
         width: '12.5%',
         isSortable: false,
       },
       main_entity_name: {
-        label: 'Name',
+        label: 'Representation',
         width: '37.5%',
         isSortable: false,
       },

diff --git a/...onents/data/trash/DeleteOperationLine.tsx → ...ponents/trash/all/DeleteOperationLine.tsx b/...onents/data/trash/DeleteOperationLine.tsx → ...ponents/trash/all/DeleteOperationLine.tsx
diff --git a/...nts/data/trash/DeleteOperationPopover.tsx → ...ents/trash/all/DeleteOperationPopover.tsx b/...nts/data/trash/DeleteOperationPopover.tsx → ...ents/trash/all/DeleteOperationPopover.tsx
@@ -10,7 +10,7 @@ import MoreVert from '@mui/icons-material/MoreVert';
 import { graphql, useMutation } from 'react-relay';
 import { PopoverProps } from '@mui/material/Popover';
 import IconButton from '@mui/material/IconButton';
-import { DeleteOperationsLinesPaginationQuery$variables } from '@components/data/trash/__generated__/DeleteOperationsLinesPaginationQuery.graphql';
+import { DeleteOperationsLinesPaginationQuery$variables } from './__generated__/DeleteOperationsLinesPaginationQuery.graphql';
 import { useFormatter } from '../../../../components/i18n';
 import Transition from '../../../../components/Transition';
 import useDeletion from '../../../../utils/hooks/useDeletion';

diff --git a/...ents/data/trash/DeleteOperationsLines.tsx → ...nents/trash/all/DeleteOperationsLines.tsx b/...ents/data/trash/DeleteOperationsLines.tsx → ...nents/trash/all/DeleteOperationsLines.tsx
@@ -1,6 +1,6 @@
 import React, { FunctionComponent } from 'react';
 import { graphql, PreloadedQuery } from 'react-relay';
-import { DeleteOperationLine, DeleteOperationLineDummy } from '@components/data/trash/DeleteOperationLine';
+import { DeleteOperationLine, DeleteOperationLineDummy } from '@components/trash/all/DeleteOperationLine';
 import type { DeleteOperationsLines_data$key } from './__generated__/DeleteOperationsLines_data.graphql';
 import type { DeleteOperationsLinesPaginationQuery, DeleteOperationsLinesPaginationQuery$variables } from './__generated__/DeleteOperationsLinesPaginationQuery.graphql';
 import ListLinesContent from '../../../../components/list_lines/ListLinesContent';