@@ -33,8 +33,13 @@ import WithLoadedTask from "../HOCs/WithLoadedTask/WithLoadedTask";
3333import IntlDatePicker from "../IntlDatePicker/IntlDatePicker" ;
3434import PaginationControl from "../PaginationControl/PaginationControl" ;
3535import SvgSymbol from "../SvgSymbol/SvgSymbol" ;
36- import { SearchFilter , TableWrapper , renderTableHeader } from "../TableShared/EnhancedTable" ;
37- import { cellStyles , inputStyles , rowStyles , tableStyles } from "../TableShared/TableStyles" ;
36+ import {
37+ SearchFilter ,
38+ TableWrapper ,
39+ renderTableHeader ,
40+ renderTableCell ,
41+ } from "../TableShared/EnhancedTable" ;
42+ import { inputStyles , rowStyles , tableStyles } from "../TableShared/TableStyles" ;
3843import ViewTask from "../ViewTask/ViewTask" ;
3944import messages from "./Messages" ;
4045import TaskAnalysisTableHeader from "./TaskAnalysisTableHeader" ;
@@ -285,22 +290,7 @@ export const TaskAnalysisTableInternal = (props) => {
285290 className = { `${ row . isExpanded ? "mr-bg-black-10" : "" } ${ rowStyles } ` }
286291 >
287292 { row . cells . map ( ( cell ) => {
288- return (
289- < td
290- key = { cell . column . id }
291- { ...cell . getCellProps ( ) }
292- className = { cellStyles }
293- style = { {
294- ...cell . getCellProps ( ) . style ,
295- maxWidth : cell . column . width ,
296- minWidth : cell . column . minWidth ,
297- overflow : "hidden" ,
298- height : "40px" ,
299- } }
300- >
301- < div className = "mr-cell-content" > { cell . render ( "Cell" ) } </ div >
302- </ td >
303- ) ;
293+ return renderTableCell ( cell ) ;
304294 } ) }
305295 </ tr >
306296
@@ -389,7 +379,18 @@ const setupColumnTypes = (props, taskBaseRoute, manager, openComments) => {
389379 id : "featureId" ,
390380 Header : props . intl . formatMessage ( messages . featureIdLabel ) ,
391381 accessor : ( t ) => t . name || t . title ,
392- Cell : ( { value } ) => value || "" ,
382+ Cell : ( { value } ) => (
383+ < div
384+ style = { {
385+ overflow : "hidden" ,
386+ whiteSpace : "nowrap" ,
387+ textOverflow : "ellipsis" ,
388+ width : "100%" ,
389+ } }
390+ >
391+ { value || "" }
392+ </ div >
393+ ) ,
393394 Filter : ( { column : { filterValue, setFilter } } ) => (
394395 < div className = "mr-flex mr-items-center" onClick = { ( e ) => e . stopPropagation ( ) } >
395396 < SearchFilter
@@ -486,6 +487,7 @@ const setupColumnTypes = (props, taskBaseRoute, manager, openComments) => {
486487 ) }
487488 </ div >
488489 ) ,
490+ width : 40 ,
489491 } ;
490492
491493 columns . status = {
@@ -937,7 +939,6 @@ const setupColumnTypes = (props, taskBaseRoute, manager, openComments) => {
937939 accessor : "commentID" ,
938940 Cell : ( { row } ) => < ViewCommentsButton onClick = { ( ) => openComments ( row . original . id ) } /> ,
939941 width : 110 ,
940-
941942 disableSortBy : true ,
942943 } ;
943944
0 commit comments