diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js index 18d8a721e2ad55cf30f4b916f34155c1459ff8a3..a9bd822854a2a0899fa51477c09df4873bc2bea2 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js @@ -65,6 +65,7 @@ let dragged = null; let reorder = []; //let confirmDatePlugin = new confirmDatePlugin(); // Define a default UI for filtering +let fixedColumns = ['Select', 'Action', 'Status Logs', 'View Summary']; const getItemStyle = ({ isDragging, isDropAnimating }, draggableStyle) => ({ ...draggableStyle, @@ -2361,11 +2362,11 @@ function Table(props) { key={column.id} draggableId={column.id} index={index} - isDragDisabled={_.includes(['Select', 'Action', 'Status Logs'], column.id)? true: false}> + isDragDisabled={_.includes(fixedColumns, column.id)? true: false}> {(provided, snapshot) => { if (column.id !== 'actionpath') { return ( - <th className={column.id} className={_.includes(['Select', 'Action', 'Status Logs'], column.id)?'fixed-column-td':''} style={{display: 'flex'}} + <th className={column.id} className={_.includes(fixedColumns, column.id)?'fixed-column-td':''} style={{display: 'flex'}} onClick={() => { if(!doServersideFilter) { if(!column.disableSortBy) { @@ -2375,7 +2376,7 @@ function Table(props) { }}> <div style={{display:'flex'}}> <div style={{display: 'grid',verticalAlign:'bottom'}}> - <div {...column.getHeaderProps(column.getSortByToggleProps())} className={_.includes(['Select', 'Action', 'Status Logs'], column.id)?'fixed-column':''}> + <div {...column.getHeaderProps(column.getSortByToggleProps())} className={_.includes(fixedColumns, column.id)?'fixed-column':''}> <div {...provided.draggableProps} {...provided.dragHandleProps} @@ -2404,7 +2405,7 @@ function Table(props) { } </div> </div> - {_.includes(['Select', 'Action', 'Status Logs'], column.id)?<></>: + {_.includes(fixedColumns, column.id)?<></>: <div {...column.getResizerProps()} className={`resizer ${ column.isResizing ? 'isResizing' : '' @@ -2440,7 +2441,7 @@ function Table(props) { {row.cells.map(cell => { if (cell.column.id !== 'actionpath') { // return <td {...cell.getCellProps()} className={cell.column.id+'_body'}> - return <td className={cell.column.id+'_body'} className={_.includes(['Select', 'Action', 'Status Logs'], cell.column.id)?'fixed-column-td':''}> + return <td className={cell.column.id+'_body'} className={_.includes(fixedColumns, cell.column.id)?'fixed-column-td':''}> {(cell.row.original.links || []).includes(cell.column.id) ? <a href={cell.row.original.linksURL[cell.column.id]}>{cell.render('Cell', cell.getCellProps())}</a> : cell.render('Cell', cell.getCellProps())} </td> } diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss index feb2983fb2cb236ac4b29d168a1b085dc9fed538..30838ccd3d33beefc178c2241a2d7740a6cf494c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss @@ -246,6 +246,7 @@ body .p-paginator { .fixed-column { width: 50px !important; min-width: 50px !important; + word-break: break-word; } .fixed-column-td {