@@ -54,29 +54,28 @@ const WorkList = () => {
54
54
} , [ workStaffs , works ] ) ;
55
55
56
56
const workLeads = useMemo ( ( ) => {
57
- return (
58
- workStaffs
59
- ?. map ( ( workStaff ) => workStaff . work_lead . full_name )
60
- . filter ( ( lead ) => lead )
61
- . sort ( ) || [ ]
57
+ return Array . from (
58
+ new Set (
59
+ workStaffs ?. map ( ( workStaff ) => workStaff . work_lead . full_name ) . sort ( ) ||
60
+ [ ]
61
+ )
62
62
) ;
63
63
} , [ workStaffs ] ) ;
64
64
65
65
const teams = useMemo ( ( ) => {
66
- return (
67
- workStaffs
68
- ?. map ( ( workStaff ) => workStaff . eao_team . name )
69
- . filter ( ( team ) => team )
70
- . sort ( ) || [ ]
66
+ return Array . from (
67
+ new Set (
68
+ workStaffs ?. map ( ( workStaff ) => workStaff . eao_team . name ) . sort ( ) || [ ]
69
+ )
71
70
) ;
72
71
} , [ workStaffs ] ) ;
73
72
74
73
const filteredStaffByPosition = useCallback (
75
- ( position : WorkStaffRole ) => {
74
+ ( roleId : number ) => {
76
75
if ( ! workStaffs ) return [ ] ;
77
76
const staff = workStaffs . flatMap ( ( row : any ) =>
78
77
row . staff
79
- ? row . staff . filter ( ( p : { role : Role } ) => p . role . id === position )
78
+ ? row . staff . filter ( ( p : { role : Role } ) => p . role . id === roleId )
80
79
: [ ]
81
80
) ;
82
81
const staffSorted = sort ( staff , "full_name" ) ;
@@ -118,12 +117,13 @@ const WorkList = () => {
118
117
return names . some ( ( name ) => filterValue . includes ( name ) ) ;
119
118
} ;
120
119
121
- const getRolfilterOptions = ( role : WorkStaffRole ) => {
120
+ const getRolefilterOptions = ( role : WorkStaffRole ) => {
122
121
return role === WorkStaffRole . OFFICER_ANALYST
123
122
? officerAnalystOptions
124
123
: coLeadOptions ;
125
124
} ;
126
-
125
+ console . log ( "OFFICER ANALYST " , officerAnalystOptions ) ;
126
+ console . log ( "CO-LEAD " , coLeadOptions ) ;
127
127
const tableColumns = React . useMemo ( ( ) => {
128
128
const cols : Array < MRT_ColumnDef < WorkStaffWithWork > > = [ ] ;
129
129
if ( workStaffs && workStaffs . length > 0 ) {
@@ -133,7 +133,7 @@ const WorkList = () => {
133
133
cols . push ( {
134
134
header : roleName ,
135
135
id : `${ WorkStaffRoleNames [ role ] } ` ,
136
- filterSelectOptions : getRolfilterOptions ( role ) ,
136
+ filterSelectOptions : getRolefilterOptions ( role ) ,
137
137
accessorFn : ( row : any ) => {
138
138
if ( ! row . staff ) {
139
139
return "" ;
0 commit comments