@@ -24,7 +24,6 @@ import { fmtMonthYear } from "utils/membersDates";
2424import { approveMemberAction } from "actions/members/approve/server_action" ;
2525import { rejectMemberAction } from "actions/members/reject/server_action" ;
2626
27-
2827const showActions = ( rows , user ) => {
2928 if ( user ?. role !== "cc" ) return false ;
3029 if ( rows . length > 0 ) {
@@ -84,7 +83,11 @@ export default function MemberPositions({
8483 if ( row . startYear < minYear ) row . startYear = minYear ;
8584
8685 // Only clamp if the month is actually set
87- if ( row . startMonth && ( row . startYear > currentYear || ( row . startYear === currentYear && row . startMonth > currentMonth ) ) ) {
86+ if (
87+ row . startMonth &&
88+ ( row . startYear > currentYear ||
89+ ( row . startYear === currentYear && row . startMonth > currentMonth ) )
90+ ) {
8891 row . startYear = currentYear ;
8992 row . startMonth = currentMonth ;
9093 }
@@ -291,82 +294,83 @@ export default function MemberPositions({
291294 } ,
292295 ...( editable
293296 ? [
294- {
295- field : "isValid" ,
296- type : "boolean" ,
297- headerName : "Valid?" ,
298- align : "center" ,
299- width : 80 ,
300- renderCell : ( p ) => (
301- < Tooltip
302- title = { p . row . error || "Valid" }
303- disableHoverListener = { p . row . isValid }
304- >
305- < span >
297+ {
298+ field : "isValid" ,
299+ type : "boolean" ,
300+ headerName : "Valid?" ,
301+ align : "center" ,
302+ width : 80 ,
303+ renderCell : ( p ) => (
304+ < Tooltip
305+ title = { p . row . error || "Valid" }
306+ disableHoverListener = { p . row . isValid }
307+ >
308+ < span >
309+ < Icon
310+ color = { p . row . isValid ? "success.main" : "error.main" }
311+ variant = { p . row . isValid ? "check-circle" : "cancel" }
312+ sx = { { height : 20 , width : 20 } }
313+ />
314+ </ span >
315+ </ Tooltip >
316+ ) ,
317+ display : "flex" ,
318+ disableColumnMenu : true ,
319+ sortable : false ,
320+ } ,
321+ {
322+ field : "action" ,
323+ align : "center" ,
324+ headerName : "" ,
325+ width : 50 ,
326+ renderCell : ( p ) => (
327+ < IconButton
328+ onMouseDown = { ( e ) => e . stopPropagation ( ) }
329+ onClick = { ( e ) => {
330+ e . stopPropagation ( ) ;
331+ onDelete ( p . row ) ;
332+ } }
333+ size = "small"
334+ >
306335 < Icon
307- color = { p . row . isValid ? "success.main" : " error.main"}
308- variant = { p . row . isValid ? "check-circle" : "cancel" }
309- sx = { { height : 20 , width : 20 } }
336+ color = " error.main"
337+ variant = "delete-forever-outline"
338+ sx = { { height : 16 , width : 16 } }
310339 />
311- </ span >
312- </ Tooltip >
313- ) ,
314- display : "flex" ,
315- disableColumnMenu : true ,
316- sortable : false ,
317- } ,
318- {
319- field : "action" ,
320- align : "center" ,
321- headerName : "" ,
322- width : 50 ,
323- renderCell : ( p ) => (
324- < IconButton onMouseDown = { ( e ) => e . stopPropagation ( ) }
325- onClick = { ( e ) => {
326- e . stopPropagation ( ) ;
327- onDelete ( p . row )
328- } }
329- size = "small"
330- >
331- < Icon
332- color = "error.main"
333- variant = "delete-forever-outline"
334- sx = { { height : 16 , width : 16 } }
335- />
336- </ IconButton >
337- ) ,
338- display : "flex" ,
339- disableColumnMenu : true ,
340- sortable : false ,
341- } ,
342- ]
340+ </ IconButton >
341+ ) ,
342+ display : "flex" ,
343+ disableColumnMenu : true ,
344+ sortable : false ,
345+ } ,
346+ ]
343347 : [
344- {
345- field : "approved" ,
346- headerName : "Status" ,
347- align : "center" ,
348- headerAlign : "center" ,
349- flex : isMobile ? null : 2 ,
350- valueGetter : ( value , row ) => ( {
351- approved : row . approved ,
352- approvalTime : row . approvalTime ,
353- rejected : row . rejected ,
354- rejectionTime : row . rejectionTime ,
355- } ) ,
356- disableExport : true ,
357- renderCell : ( {
358- value : { approved, approvalTime, rejected, rejectionTime } ,
359- } ) => (
360- < Tooltip
361- title = {
362- approved
363- ? approvalTime || "No Information Available"
364- : rejected
365- ? rejectionTime || "No Information Available"
366- : null
367- }
368- placement = "left-start"
369- >
348+ {
349+ field : "approved" ,
350+ headerName : "Status" ,
351+ align : "center" ,
352+ headerAlign : "center" ,
353+ flex : isMobile ? null : 2 ,
354+ valueGetter : ( value , row ) => ( {
355+ approved : row . approved ,
356+ approvalTime : row . approvalTime ,
357+ rejected : row . rejected ,
358+ rejectionTime : row . rejectionTime ,
359+ } ) ,
360+ disableExport : true ,
361+ renderCell : ( {
362+ value : { approved, approvalTime, rejected, rejectionTime } ,
363+ } ) => (
364+ < Tooltip
365+ title = {
366+ approved
367+ ? approvalTime || "No Information Available"
368+ : rejected
369+ ? rejectionTime || "No Information Available"
370+ : null
371+ }
372+ placement = "left-start"
373+ >
370374 < span >
371375 < Tag
372376 label = {
@@ -378,41 +382,41 @@ export default function MemberPositions({
378382 sx = { { my : 2 } }
379383 />
380384 </ span >
381- </ Tooltip >
382- ) ,
383- display : "flex" ,
384- } ,
385- ...( showActions ( rows , user )
386- ? [
387- {
388- field : "actions" ,
389- align : "center" ,
390- headerName : "" ,
391- width : 100 ,
392- valueGetter : ( value , row ) => ( {
393- approved : row . approved ,
394- rejected : row . rejected ,
395- rid : row . rid ,
396- } ) ,
397- disableExport : true ,
398- disableColumnMenu : true ,
399- sortable : false ,
400- renderCell : ( { value : { approved, rejected, rid } } ) => (
401- < >
402- { approved || rejected ? null : (
385+ </ Tooltip >
386+ ) ,
387+ display : "flex" ,
388+ } ,
389+ ...( showActions ( rows , user )
390+ ? [
391+ {
392+ field : "actions" ,
393+ align : "center" ,
394+ headerName : "" ,
395+ width : 100 ,
396+ valueGetter : ( value , row ) => ( {
397+ approved : row . approved ,
398+ rejected : row . rejected ,
399+ rid : row . rid ,
400+ } ) ,
401+ disableExport : true ,
402+ disableColumnMenu : true ,
403+ sortable : false ,
404+ renderCell : ( { value : { approved, rejected, rid } } ) => (
403405 < >
404- < ApproveButton rid = { rid } member = { member } />
405- < Box sx = { { mx : 1 } } />
406- < RejectButton rid = { rid } member = { member } />
406+ { approved || rejected ? null : (
407+ < >
408+ < ApproveButton rid = { rid } member = { member } />
409+ < Box sx = { { mx : 1 } } />
410+ < RejectButton rid = { rid } member = { member } />
411+ </ >
412+ ) }
407413 </ >
408- ) }
409- </ >
410- ) ,
411- display : "flex" ,
412- } ,
413- ]
414- : [ ] ) ,
415- ] ) ,
414+ ) ,
415+ display : "flex" ,
416+ } ,
417+ ]
418+ : [ ] ) ,
419+ ] ) ,
416420 ] ;
417421
418422 return (
0 commit comments