made selected group active after adding a member

Merge branch 'group-page-bug-fixed' of WrenchBoard/Users-Wrench into master
fixed group list member bug
2024-01-05 20:00:55 +01:00 · 2024-01-05 17:14:12 +00:00 · 2024-01-05 18:05:52 +01:00 · 2024-01-05 13:21:43 +00:00
1 changed files with 10 additions and 5 deletions
@@ -20,7 +20,7 @@ export default function JobGroups() {
        members: []
    })

-    const [selectedGroup, setSelectedGroup] = useState({id:'', data: []})
+    const [selectedGroup, setSelectedGroup] = useState({id:'', name:'', data: []})

    const changeSelectedGroup = (e) => {
        let groupID = e.target.value
@@ -42,10 +42,15 @@ export default function JobGroups() {
                return
            }
            setGroupList({loading: false, groups: data.result_list, members: data.result_list_member})
-            let activeGroupId = data.result_list[0].group_id
-            let activeGroup = data.result_list[0].group_name
-            let activeMembers = data.result_list_member.filter(item => item.group_id == activeGroupId)
-            setSelectedGroup({id: activeGroupId, name:activeGroup, data:activeMembers})
+            if(selectedGroup.id == ''){
+                let activeGroupId = data.result_list[0].group_id
+                let activeGroup = data.result_list[0].group_name
+                let activeMembers = data.result_list_member?.filter(item => item.group_id == activeGroupId)
+                setSelectedGroup({id: activeGroupId, name:activeGroup, data:activeMembers})
+            }else{
+                let activeMembers = data.result_list_member?.filter(item => item.group_id == selectedGroup?.id)
+                setSelectedGroup({id: selectedGroup?.id, name:selectedGroup?.name, data:activeMembers})
+            }
        }).catch(error => {
            setGroupList({loading: false, groups: [], members: []})
            console.log(error)
Author	SHA1	Message	Date
victorAnumudu	151aa4ba0c	made selected group active after adding a member	2024-01-05 20:00:55 +01:00
ameye	4985256c3a	Merge branch 'group-page-bug-fixed' of WrenchBoard/Users-Wrench into master	2024-01-05 17:14:12 +00:00
victorAnumudu	5c552fe006	fixed group list member bug	2024-01-05 18:05:52 +01:00
ameye	b14272f040	Merge branch 'job-groups-page' of WrenchBoard/Users-Wrench into master	2024-01-05 13:21:43 +00:00