Revize fdf6c32d

Administation page finished
re #9818

frontend/src/features/Administration/Administration.tsx

@@ -19 +19 @@
 import {
     clear,
     consumeError,
+    resetIsRequestCompleted,
     setLoading,
     setSelectedUser
 } from "./userDetailSlice"
@@ -34 +35 @@
     const loading = useSelector((state: RootState) => state.usersDetail.loading)
     const apiError = useSelector((state: RootState) => state.usersDetail.error)
     const selectedUser = useSelector((state: RootState) => state.usersDetail.selectedUser)
+    const isRequestCompleted = useSelector((state: RootState) => state.usersDetail.isRequestCompleted)
     const [selectedUserId, setSelectedUserId] = useState<number | undefined>(undefined)
 
     // Local state to display any error relevant error
@@ -59 +61 @@
     // Use effect to read the error and consume it
     useEffect(() => {
         if (users.length > 0) {
-            setSelectedUserId(0)
-            dispatch(setSelectedUser(users.at(0)))
-            console.log("selected id: " + selectedUser)
+            // if there is user selected, leave that state - handled by useEffect on isRequestCompleted
+            if (selectedUser !== undefined) {
+                const selUser = users.find(u => u.email === selectedUser.email)
+                if (selUser !== undefined) {
+                    console.log("Selected from before")
+                    console.log(selUser)
+                    setSelectedUserId(users.findIndex(u => u.email === selectedUser.email))
+                    dispatch(setSelectedUser(selUser))
+                    return
+                }
+            } else {
+                setSelectedUserId(0)
+                dispatch(setSelectedUser(users.at(0)))
+            }
         }
-    }, [users])
+    }, [users, dispatch])
+
+    useEffect(() => {
+        if (isRequestCompleted) {
+            dispatch(resetIsRequestCompleted())
+            // dispatch(clear())
+            dispatch(fetchUsers())
+            // setSelectedUserId(0)
+            // dispatch(setSelectedUser(users.at(0)))
+            //
+            // if (users.length > 0) {
+            //     setSelectedUserId(0)
+            //     dispatch(setSelectedUser(users.at(0)))
+            //     console.log("selected id: " + selectedUser)
+            // }
+        }
+    }, [isRequestCompleted, dispatch])
 
 
     // Use effect to read the error and consume it
@@ -87 +116 @@
         }
     }, [dispatch])
 
-    const childClosed = () => {
-        dispatch(clear())
-        dispatch(fetchUsers())
-        setSelectedUserId(0)
-        dispatch(setSelectedUser(users.at(0)))
-    }
-
     return (
         <Fragment>
             <ShowErrorIfPresent err={displayError} />
@@ -129 +151 @@
                     </Grid>
                     <Grid item md={9} xs={6}>
                         {selectedUserId !== undefined  ?
-                            <UserDetail user={selectedUser as UserDto} onClose={childClosed} />
+                            <UserDetail user={selectedUser as UserDto}/>
                         : null }
                     </Grid>
                 </Grid>