diff --git a/openbas-front/eslint.config.js b/openbas-front/eslint.config.js
index e0756b9310..ebd8db5abc 100644
--- a/openbas-front/eslint.config.js
+++ b/openbas-front/eslint.config.js
@@ -151,12 +151,14 @@ export default [
'error', {
patterns: [
{
- group: ['@mui/material/*', '!@mui/material/locale', '!@mui/material/styles', '!@mui/material/colors', '!@mui/material/transitions'],
- message: 'Please use named import from @mui/material instead.',
- },
- {
- group: ['@mui/styles/*'],
- message: 'Please use named import from @mui/styles instead.',
+ group: [
+ '@mui/material/*', '!@mui/material/locale', '!@mui/material/styles', '!@mui/material/colors', '!@mui/material/transitions',
+ '@mui/styles/*',
+ '@mui/x-date-pickers/*', '!@mui/x-date-pickers/AdapterDateFnsV3',
+ '@mui/icons-material/*',
+ '@mui/lab/*',
+ ],
+ message: 'Please use named import from @mui/* instead.',
},
],
},
diff --git a/openbas-front/package.json b/openbas-front/package.json
index 7bf61f425e..bfc99cf841 100644
--- a/openbas-front/package.json
+++ b/openbas-front/package.json
@@ -14,12 +14,13 @@
"@fontsource/ibm-plex-sans": "5.0.21",
"@hookform/resolvers": "3.9.0",
"@microsoft/fetch-event-source": "2.0.1",
- "@mui/icons-material": "5.16.7",
- "@mui/lab": "5.0.0-alpha.173",
- "@mui/material": "5.16.7",
- "@mui/styles": "5.16.7",
- "@mui/utils": "5.16.6",
- "@mui/x-date-pickers": "7.22.0",
+ "@mui/icons-material": "6.1.6",
+ "@mui/lab": "6.0.0-beta.14",
+ "@mui/material": "6.1.6",
+ "@mui/styles": "6.1.6",
+ "@mui/system": "6.1.6",
+ "@mui/utils": "6.1.6",
+ "@mui/x-date-pickers": "7.22.1",
"@redux-devtools/extension": "3.3.0",
"@uiw/react-md-editor": "4.0.4",
"@xyflow/react": "12.3.0",
diff --git a/openbas-front/src/admin/components/assets/asset_groups/AssetGroups.tsx b/openbas-front/src/admin/components/assets/asset_groups/AssetGroups.tsx
index 6f9ceeff95..0355d235f4 100644
--- a/openbas-front/src/admin/components/assets/asset_groups/AssetGroups.tsx
+++ b/openbas-front/src/admin/components/assets/asset_groups/AssetGroups.tsx
@@ -1,4 +1,4 @@
-import { Box, Chip, Drawer as MuiDrawer, List, ListItem, ListItemIcon, ListItemSecondaryAction, ListItemText } from '@mui/material';
+import { Box, Chip, Drawer as MuiDrawer, List, ListItem, ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
import { makeStyles } from '@mui/styles';
import { SelectGroup } from 'mdi-material-ui';
import { CSSProperties, Fragment, useMemo, useState } from 'react';
@@ -234,30 +234,8 @@ const AssetGroups = () => {
{assetGroups.map((assetGroup: AssetGroupOutput) => (
setSelectedAssetGroupId(assetGroup.asset_group_id)}
- >
-
-
-
-
- {headers.map(header => (
-
- {header.value?.(assetGroup)}
-
- ))}
-
- )}
- />
-
+ secondaryAction={(
setAssetGroups(assetGroups.map(ag => (ag.asset_group_id !== result.asset_group_id ? ag : result)))}
@@ -270,7 +248,32 @@ const AssetGroups = () => {
})))}
openEditOnInit={assetGroup.asset_group_id === searchId}
/>
-
+ )}
+ disablePadding
+ >
+ setSelectedAssetGroupId(assetGroup.asset_group_id)}
+ >
+
+
+
+
+ {headers.map(header => (
+
+ {header.value?.(assetGroup)}
+
+ ))}
+
+ )}
+ />
+
))}
diff --git a/openbas-front/src/admin/components/common/articles/ArticleAddDocuments.js b/openbas-front/src/admin/components/common/articles/ArticleAddDocuments.js
index 76fe4f633a..e60a4581d8 100644
--- a/openbas-front/src/admin/components/common/articles/ArticleAddDocuments.js
+++ b/openbas-front/src/admin/components/common/articles/ArticleAddDocuments.js
@@ -1,5 +1,17 @@
import { ControlPointOutlined, DescriptionOutlined } from '@mui/icons-material';
-import { Box, Button, Chip, Dialog, DialogActions, DialogContent, DialogTitle, Grid, List, ListItem, ListItemIcon, ListItemText } from '@mui/material';
+import {
+ Box,
+ Button,
+ Chip,
+ Dialog,
+ DialogActions,
+ DialogContent,
+ DialogTitle,
+ Grid,
+ List,
+ ListItemButton,
+ ListItemIcon,
+ ListItemText } from '@mui/material';
import { makeStyles } from '@mui/styles';
import * as R from 'ramda';
import { useContext, useState } from 'react';
@@ -145,120 +157,122 @@ const ArticleAddDocuments = (props) => {
const { permissions } = useContext(PermissionsContext);
return (
-
-
-
-
-
-
-
-
+
+ )
);
};
diff --git a/openbas-front/src/admin/components/common/articles/ArticleForm.js b/openbas-front/src/admin/components/common/articles/ArticleForm.js
index 85ef587e5c..254ac33406 100644
--- a/openbas-front/src/admin/components/common/articles/ArticleForm.js
+++ b/openbas-front/src/admin/components/common/articles/ArticleForm.js
@@ -1,5 +1,5 @@
import { ArrowDropDownOutlined, ArrowDropUpOutlined, AttachmentOutlined } from '@mui/icons-material';
-import { Box, Button, Grid, List, ListItem, ListItemIcon, ListItemSecondaryAction, ListItemText, Typography } from '@mui/material';
+import { Box, Button, Grid, List, ListItem, ListItemButton, ListItemIcon, ListItemSecondaryAction, ListItemText, Typography } from '@mui/material';
import { makeStyles } from '@mui/styles';
import * as R from 'ramda';
import { useState } from 'react';
@@ -185,6 +185,7 @@ const ArticleForm = ({
// Rendering
return (
+