[frontend] New import screens under feature flag (#3016)

OpenCTI-Platform · Sep 10, 2024 · 2452184 · 2452184
1 parent c7e2938
commit 2452184
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/opencti-platform/opencti-front/src/private/components/data/ImportMenu.tsx b/opencti-platform/opencti-front/src/private/components/data/ImportMenu.tsx
@@ -4,8 +4,8 @@ import useHelper from '../../../utils/hooks/useHelper';
 
 const ImportMenu = () => {
   const { isFeatureEnable } = useHelper();
-  const isDataTableEnabled = isFeatureEnable('DATA_TABLES');
-  if (!isDataTableEnabled) {
+  const isNewImportScreensEnabled = isFeatureEnable('NEW_IMPORT_SCREENS');
+  if (!isNewImportScreensEnabled) {
     return (
       <NavToolbarMenu
         entries={[{

diff --git a/opencti-platform/opencti-front/src/private/components/data/import/Import.tsx b/opencti-platform/opencti-front/src/private/components/data/import/Import.tsx
@@ -4,18 +4,22 @@ import ImportContent, { importContentQuery } from './ImportContent';
 import Loader from '../../../../components/Loader';
 import { ImportContentQuery } from './__generated__/ImportContentQuery.graphql';
 import useQueryLoading from '../../../../utils/hooks/useQueryLoading';
+import useHelper from '../../../../utils/hooks/useHelper';
 
 interface ImportContentContainerProps {
   queryRef: PreloadedQuery<ImportContentQuery>;
 }
 
 const ImportContentContainer: FunctionComponent<ImportContentContainerProps> = ({ queryRef }) => {
   const data = usePreloadedQuery(importContentQuery, queryRef);
+  const { isFeatureEnable } = useHelper();
+  const isNewImportScreensEnabled = isFeatureEnable('NEW_IMPORT_SCREENS');
   return (
     <ImportContent
       connectorsImport={data.connectorsForImport}
       importFiles={data.importFiles}
       pendingFiles={data.pendingFiles}
+      isNewImportScreensEnabled={isNewImportScreensEnabled}
     />
   );
 };

diff --git a/opencti-platform/opencti-front/src/private/components/data/import/ImportContent.jsx b/opencti-platform/opencti-front/src/private/components/data/import/ImportContent.jsx
@@ -90,7 +90,6 @@ const styles = (theme) => ({
   createButton: {
     position: 'fixed',
     bottom: 30,
-    right: 230,
   },
 });
 
@@ -335,6 +334,7 @@ class ImportContentComponent extends Component {
       nsdt,
       connectorsImport,
       relay,
+      isNewImportScreensEnabled,
     } = this.props;
     const { edges: importFilesEdges } = importFiles;
     const { edges: pendingFilesEdges } = pendingFiles;
@@ -348,9 +348,9 @@ class ImportContentComponent extends Component {
     const invalidCsvMapper = this.state.selectedConnector?.name === 'ImportCsv'
       && this.state.selectedConnector?.configurations?.length === 0;
     return (
-      <div style={{ paddingRight: 200 }}>
+      <div style={{ paddingRight: isNewImportScreensEnabled ? 200 : 0 }}>
         <Breadcrumbs variant="list" elements={[{ label: t('Data') }, { label: t('Import'), current: true }]} />
-        <ImportMenu />
+        {isNewImportScreensEnabled && <ImportMenu/>}
         <Grid
           container={true}
           spacing={3}
@@ -705,6 +705,7 @@ class ImportContentComponent extends Component {
           color="primary"
           aria-label="Add"
           className={classes.createButton}
+          style={{ right: isNewImportScreensEnabled ? 230 : 30 }}
         >
           <Add />
         </Fab>

diff --git a/opencti-platform/opencti-front/src/private/components/data/import/Root.jsx b/opencti-platform/opencti-front/src/private/components/data/import/Root.jsx
@@ -8,21 +8,21 @@ import useHelper from '../../../../utils/hooks/useHelper';
 
 const Root = () => {
   const { isFeatureEnable } = useHelper();
-  const isDataTableEnabled = isFeatureEnable('DATA_TABLES');
+  const isNewImportScreensEnables = isFeatureEnable('NEW_IMPORT_SCREENS');
   return (
     <Routes>
       <Route path="/" Component={Import} />
       <Route
         path="/pending/:fileId"
         element={<WorkbenchFile />}
       />
-      {isDataTableEnabled && (
+      {isNewImportScreensEnables && (
         <Route
           path="/file"
           element={<ImportFilesContent />}
         />
       )}
-      {isDataTableEnabled && (
+      {isNewImportScreensEnables && (
         <Route
           path="/workbench"
           element={<ImportWorkbenchesContent />}

diff --git a/opencti-platform/opencti-graphql/config/default.json b/opencti-platform/opencti-graphql/config/default.json
@@ -9,6 +9,7 @@
     "disabled_dev_features": [
       "FAB_REPLACEMENT",
       "4352_BULK_RELATIONS",
+      "NEW_IMPORT_SCREENS",
       "FILIGRAN_LOADER",
       "BULK_ENTITIES",
       "CONTAINERS_AUTHORIZED_MEMBERS",