Handle access rights. (#426)

Signed-off-by: AAJELLAL <[email protected]>

Author: AAJELLAL

src/components/dialogs/access-rights-dialog.jsx

@@ -14,10 +14,6 @@ import Button from '@mui/material/Button';
 import PropTypes from 'prop-types';
 import React from 'react';
 import Alert from '@mui/material/Alert';
-import FormControl from '@mui/material/FormControl';
-import RadioGroup from '@mui/material/RadioGroup';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import Radio from '@mui/material/Radio';
 import { ElementType } from '@gridsuite/commons-ui';
 import { useNameField } from './field-hook';
 import { CancelButton } from '@gridsuite/commons-ui';
@@ -38,8 +34,6 @@ export const CreateDirectoryDialog = ({
     parentDirectory,
     error,
 }) => {
-    const [isPrivate, setIsPrivate] = React.useState(true);
-
     const [name, nameField, nameError, nameOk] = useNameField({
         label: 'nameProperty',
         autoFocus: true,
@@ -56,11 +50,7 @@ export const CreateDirectoryDialog = ({
     };
 
     const handleClick = () => {
-        onClick(name, isPrivate);
-    };
-
-    const handleChange = (event) => {
-        setIsPrivate(event.target.value);
+        onClick(name);
     };
 
     const canCreate = () => {
@@ -77,26 +67,6 @@ export const CreateDirectoryDialog = ({
             <DialogTitle>{title}</DialogTitle>
             <DialogContent>
                 {nameField}
-                <FormControl>
-                    <RadioGroup
-                        aria-label=""
-                        name="DirectoryAccessRights"
-                        value={isPrivate + ''}
-                        onChange={handleChange}
-                        row
-                    >
-                        <FormControlLabel
-                            value="false"
-                            control={<Radio />}
-                            label={<FormattedMessage id="public" />}
-                        />
-                        <FormControlLabel
-                            value="true"
-                            control={<Radio />}
-                            label={<FormattedMessage id="private" />}
-                        />
-                    </RadioGroup>
-                </FormControl>
                 <br />
                 {nameError && <Alert severity="error">{nameError}</Alert>}
                 {error !== '' && <Alert severity="error">{error}</Alert>}

src/components/dialogs/create-directory-dialog.jsx

@@ -50,12 +50,12 @@ const DeleteDialog = ({
     const openRef = useRef(null);
 
     useEffect(() => {
-        if (open && !openRef.current) {
+        if ((open && !openRef.current) || error !== '') {
             setItemState(items);
             setLoadingState(false);
         }
         openRef.current = open;
-    }, [open, items]);
+    }, [open, items, error]);
 
     const handleClose = (_, reasonOfClose) => {
         if (

src/components/dialogs/delete-dialog.jsx

@@ -8,14 +8,11 @@
 import React, { useCallback, useEffect, useRef } from 'react';
 
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import LockIcon from '@mui/icons-material/Lock';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
 import Typography from '@mui/material/Typography';
 import Tooltip from '@mui/material/Tooltip';
 import Zoom from '@mui/material/Zoom';
 
-import { FormattedMessage } from 'react-intl';
-
 import { useDispatch, useSelector } from 'react-redux';
 import { setSelectedDirectory } from '../redux/actions';
 import CustomTreeItem from './custom-tree-item';
@@ -176,20 +173,6 @@ const DirectoryTreeView = ({
                             handleContextMenuClick(e, node.elementUuid)
                         }
                     >
-                        {node.accessRights?.isPrivate ? (
-                            <Tooltip
-                                TransitionComponent={Zoom}
-                                disableFocusListener
-                                disableTouchListener
-                                enterDelay={1000}
-                                enterNextDelay={1000}
-                                title={<FormattedMessage id="private" />}
-                                placement="bottom"
-                                arrow
-                            >
-                                <LockIcon sx={styles.icon} />
-                            </Tooltip>
-                        ) : null}
                         <Tooltip
                             TransitionComponent={Zoom}
                             disableFocusListener

src/components/directory-tree-view.jsx

@@ -273,6 +273,7 @@ const ContentContextualMenu = (props) => {
         onClose();
         setOpenDialog(DialogsId.NONE);
         setHideMenu(false);
+        setDeleteError('');
     }, [onClose, setOpenDialog]);
 
     const handleCloseExportDialog = useCallback(() => {
@@ -283,12 +284,14 @@ const ContentContextualMenu = (props) => {
     const [deleteError, setDeleteError] = useState('');
     const handleDeleteElements = useCallback(
         (elementsUuids) => {
+            setDeleteError('');
             deleteElements(elementsUuids, selectedDirectory.elementUuid)
+                .then(() => handleCloseDialog())
+                //show the error message and don't close the dialog
                 .catch((error) => {
                     setDeleteError(error.message);
                     handleLastError(error.message);
-                })
-                .finally(() => handleCloseDialog());
+                });
         },
         [selectedDirectory?.elementUuid, handleCloseDialog, handleLastError]
     );