| @@ -54,11 +54,12 @@ const StaffAllocation: React.FC<Props> = ({ allStaffs: staff }) => { | |||||
| }, []); | }, []); | ||||
| const setTeamLead = useCallback((staff: StaffResult) => { | const setTeamLead = useCallback((staff: StaffResult) => { | ||||
| setSeletedTeamLead(staff.id) | setSeletedTeamLead(staff.id) | ||||
| const rearrangedList = getValues("addStaffIds").reduce<number[]>((acc, num, index) => { | const rearrangedList = getValues("addStaffIds").reduce<number[]>((acc, num, index) => { | ||||
| if (num === staff.id && index !== 0) { | if (num === staff.id && index !== 0) { | ||||
| acc.splice(index, 1); | acc.splice(index, 1); | ||||
| acc.unshift(num); | |||||
| acc.unshift(num) | |||||
| } | } | ||||
| return acc; | return acc; | ||||
| }, getValues("addStaffIds")); | }, getValues("addStaffIds")); | ||||
| @@ -69,10 +70,10 @@ const StaffAllocation: React.FC<Props> = ({ allStaffs: staff }) => { | |||||
| return selectedStaff.find((staff) => staff.id === id); | return selectedStaff.find((staff) => staff.id === id); | ||||
| }); | }); | ||||
| console.log(rearrangedStaff) | console.log(rearrangedStaff) | ||||
| // setSelectedStaff(rearrangedStaff as StaffResult[]); | |||||
| setSelectedStaff(rearrangedStaff as StaffResult[]); | |||||
| setValue("addStaffIds", rearrangedList) | setValue("addStaffIds", rearrangedList) | ||||
| }, []); | |||||
| }, [addStaff, selectedStaff]); | |||||
| const clearSubsidiary = useCallback(() => { | const clearSubsidiary = useCallback(() => { | ||||
| if (defaultValues !== undefined) { | if (defaultValues !== undefined) { | ||||
| @@ -92,6 +93,10 @@ const StaffAllocation: React.FC<Props> = ({ allStaffs: staff }) => { | |||||
| ); | ); | ||||
| }, [selectedStaff, setValue]); | }, [selectedStaff, setValue]); | ||||
| useEffect(() => { | |||||
| console.log(selectedStaff) | |||||
| }, [selectedStaff]); | |||||
| const StaffPoolColumns = useMemo<Column<StaffResult>[]>( | const StaffPoolColumns = useMemo<Column<StaffResult>[]>( | ||||
| () => [ | () => [ | ||||
| { | { | ||||
| @@ -125,7 +130,7 @@ const StaffAllocation: React.FC<Props> = ({ allStaffs: staff }) => { | |||||
| buttonIcon: <StarsIcon />, | buttonIcon: <StarsIcon />, | ||||
| }, | }, | ||||
| ], | ], | ||||
| [removeStaff, t] | |||||
| [removeStaff, selectedStaff, t] | |||||
| ); | ); | ||||
| const [query, setQuery] = React.useState(""); | const [query, setQuery] = React.useState(""); | ||||