Merge pull request #257 from AtlasRender/bug-fixes-3

Bug fixes part 2
AtlasRender · Dec 17, 2020 · 4981d26 · 4981d26
2 parents 09d8bb9 + 6c2cf57
commit 4981d26
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 54 deletions.
diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx
@@ -6,29 +6,31 @@
  * All rights reserved.
  */
 
-import React from "react";
+import React, {ChangeEvent} from "react";
 import {FormControl, InputAdornment, InputBase, withStyles} from "@material-ui/core";
 import Stylable from "../../interfaces/Stylable";
 import styles from "./styles";
 import CloseIcon from "@material-ui/icons/Close";
 import SearchIcon from "@material-ui/icons/Search";
 
 interface SearchBarProps extends Stylable {
-
+    onChange?(event: ChangeEvent<HTMLInputElement>): void;
 }
 
 const SearchBar = React.forwardRef((props: SearchBarProps, ref) => {
     const {
         classes,
         className,
         style,
+        onChange,
     } = props;
 
 
     return (
         <FormControl style={{width: "100%"}}>
             <InputBase
                 className={classes.searchInput}
+                onChange={onChange}
                 placeholder="Search…"
                 endAdornment={
                     <InputAdornment position="end">

diff --git a/src/layout/MonitorLayout/MonitorLayout.tsx b/src/layout/MonitorLayout/MonitorLayout.tsx
@@ -154,7 +154,7 @@ const MonitorLayout = React.forwardRef((props: MonitorLayoutProps, ref: Ref<HTML
             .catch(err => {
                 const errorHandler = new ErrorHandler(enqueueErrorSnackbar);
                 errorHandler
-                    // .on(401, () => {logout()})
+                    .on(401, () => {logout()})
                     .on(404, "User not found")
                     .handle(err);
             })

diff --git a/src/views/OrganizationPageView/LocalComponents/DialogUser/DialogUser.tsx b/src/views/OrganizationPageView/LocalComponents/DialogUser/DialogUser.tsx
@@ -34,6 +34,8 @@ import UserData from "../../../../interfaces/UserData";
 import Role from "../../../../interfaces/Role";
 import SearchIcon from "@material-ui/icons/Search";
 import CloseIcon from "@material-ui/icons/Close";
+import SearchBar from "../../../../components/SearchBar/SearchBar";
+import useAuth from "../../../../hooks/useAuth";
 
 interface DialogUserProps extends Stylable {
     user: UserData | null;
@@ -64,16 +66,31 @@ const DialogUser = React.forwardRef((props: DialogUserProps, ref: Ref<any>) => {
         onRemoveRole,
     } = props;
 
+
     const confirm = useConfirm();
+    const {getUser} = useAuth();
+    const loggedUser = getUser();
+
+
+    // const [user, setUser] = useState<UserData | null>(userOrg);
     const [isAddRoleToUserButtonActive, setIsAddRoleToUserButtonActive] = useState<null | HTMLElement>(null);
     const [isRemoveRoleFromUserButtonActive, setIsRemoveRoleFromUserButtonActive] = useState<null | HTMLElement>(null);
     const [filterRoles, setFilterRoles] = useState<Role[]>(roles);
     const [searchValue, setSearchValue] = useState("");
 
+
     useEffect(() => {
         setFilterRoles(roles.filter(role => role.name.toLowerCase().includes(searchValue)));
     }, [searchValue]);
 
+    useEffect(() => {
+        setFilterRoles(roles);
+    }, [roles]);
+
+    // useEffect(() => {
+    //     setUser(userOrg);
+    // }, [userOrg]);
+
     function handleSearch(event: React.ChangeEvent<HTMLInputElement>) {
         setSearchValue(event.target.value.toLowerCase());
     }
@@ -164,23 +181,26 @@ const DialogUser = React.forwardRef((props: DialogUserProps, ref: Ref<any>) => {
                             </ListItemText>
                         </ListItem>
                         <Divider/>
-                        <Box className={classes.search}>
-                            <Box className={classes.searchIcon}>
-                                <SearchIcon/>
-                            </Box>
-                            <InputBase
-                                onChange={handleSearch}
-                                placeholder="Search…"
-                                classes={{
-                                    root: classes.inputRoot,
-                                    input: classes.inputInput,
-                                }}
-                                inputProps={{"aria-label": "search"}}
-                            />
-                            <IconButton>
-                                <CloseIcon/>
-                            </IconButton>
-                        </Box>
+                        <ListItem>
+                            <SearchBar onChange={handleSearch}/>
+                        </ListItem>
+                        {/*<Box className={classes.search}>*/}
+                        {/*    <Box className={classes.searchIcon}>*/}
+                        {/*        <SearchIcon/>*/}
+                        {/*    </Box>*/}
+                        {/*    <InputBase*/}
+                        {/*        onChange={handleSearch}*/}
+                        {/*        placeholder="Search…"*/}
+                        {/*        classes={{*/}
+                        {/*            root: classes.inputRoot,*/}
+                        {/*            input: classes.inputInput,*/}
+                        {/*        }}*/}
+                        {/*        inputProps={{"aria-label": "search"}}*/}
+                        {/*    />*/}
+                        {/*    <IconButton>*/}
+                        {/*        <CloseIcon/>*/}
+                        {/*    </IconButton>*/}
+                        {/*</Box>*/}
                         {filterRoles.length !== 0 ? filterRoles.map(role => {
 
                                 return (
@@ -247,7 +267,7 @@ const DialogUser = React.forwardRef((props: DialogUserProps, ref: Ref<any>) => {
                         onClick={() => confirm(async () => onRemove([user?.id]), {title: `are you sure you want to remove user: ${user?.username} ?`})}
 
                     >
-                        Remove User from Organization
+                        {loggedUser?.id === user?.id ? "Leave from Organization" : "Remove User from Organization"}
                     </Button>
                 </Box>
 

diff --git a/src/views/OrganizationPageView/LocalComponents/PluginComponent/PluginComponent.tsx b/src/views/OrganizationPageView/LocalComponents/PluginComponent/PluginComponent.tsx
@@ -20,7 +20,10 @@ import Plugin from "../../../../interfaces/Plugin";
  */
 interface PluginComponentProps extends Stylable {
     plugin: Plugin,
+    can?: boolean,
+
     invokeDialog(): void,
+
     setCurrentPlugin(id: number): void,
 }
 
@@ -37,19 +40,25 @@ const PluginComponent = React.forwardRef((props: PluginComponentProps, ref: Ref<
         plugin,
         invokeDialog,
         setCurrentPlugin,
+        can = true,
     } = props;
 
     return (
         <Grid container spacing={0} className={classes.container}>
             <Grid item xs={10}>
                 <List className={classes.listRoot}>
-                    <ListItem style={style} className={className} button onClick={()=>{invokeDialog(); setCurrentPlugin(plugin.id)}}>
+                    <ListItem style={style} className={className} button onClick={() => {
+                        invokeDialog();
+                        setCurrentPlugin(plugin.id);
+                    }}>
                         <ListItemText primary={plugin.name} secondary={plugin.description}/>
+                        {can &&
                         <ListItemSecondaryAction>
                             <IconButton>
                                 <CloseIcon/>
                             </IconButton>
                         </ListItemSecondaryAction>
+                        }
                     </ListItem>
                 </List>
             </Grid>

diff --git a/src/views/OrganizationPageView/LocalComponents/TopicWithButton/TopicWithButton.tsx b/src/views/OrganizationPageView/LocalComponents/TopicWithButton/TopicWithButton.tsx
@@ -30,6 +30,7 @@ import List from "@material-ui/core/List";
  */
 interface TopicWithButtonProps extends Stylable {
     children?: string,
+    can?: boolean;
 
     onClick?(): void,
 }
@@ -46,13 +47,15 @@ const TopicWithButton = React.forwardRef((props: TopicWithButtonProps, ref: Ref<
         className,
         children,
         onClick,
+        can = true
     } = props;
     return (
         <Grid container className={classes.firstLine}>
             <Grid item xs={12} md={10}>
                 <List component="nav" aria-label="secondary mailbox folders">
                     <ListItem className={classes.paddingNone}>
                         <ListItemText primary={children} primaryTypographyProps={{variant: "h6"}}/>
+                        {can &&
                         <ListItemSecondaryAction>
                             <IconButton
                                 edge="end"
@@ -62,6 +65,7 @@ const TopicWithButton = React.forwardRef((props: TopicWithButtonProps, ref: Ref<
                                 <AddIcon/>
                             </IconButton>
                         </ListItemSecondaryAction>
+                        }
                     </ListItem>
                     <Divider/>
                 </List>