diff --git a/src/components/DeviceList.js b/src/components/DeviceList.js index 59ceda5..ecb70b3 100644 --- a/src/components/DeviceList.js +++ b/src/components/DeviceList.js @@ -9,7 +9,8 @@ import { CCard, CCardHeader, CRow, - CCol + CCol, + CPopover } from '@coreui/react' import ReactPaginate from 'react-paginate'; import Select from 'react-select' @@ -145,11 +146,10 @@ const DeviceList = () => { const DeviceListDisplay = ({ devices, toggleDetails, details, loading, updateDevicesPerPage, pageCount, updatePage }) => { const columns = [ - { key: 'deviceType', label: 'Type', filter: false, sorter: false, _style: { width: '1%' },}, + { key: 'deviceType', label: '', filter: false, sorter: false, _style: { width: '1%' },}, { key: 'serialNumber', _style: { width: '1%' }}, { key: 'UUID', label: 'Config Id', _style: { width: '1%' }}, { key: 'firmware', filter: false, _style: { width: '20%' }, }, - { key: 'connected', _style: { width: '1%' }, sorter: false}, { key: 'txBytes', label: 'Tx', filter: false, _style: { width: '7%' } }, { key: 'rxBytes', label: 'Rx', filter: false, _style: { width: '7%' } }, { key: 'ipAddress', _style: { width: '20%' }}, @@ -225,7 +225,14 @@ const DeviceListDisplay = ({ devices, toggleDetails, details, loading, updateDev 'deviceType': (item)=>( - {getDeviceIcon(item.deviceType) ?? item.deviceType} + + + {getDeviceIcon(item.deviceType) ?? item.deviceType} + + ), 'firmware': @@ -252,14 +259,6 @@ const DeviceListDisplay = ({ devices, toggleDetails, details, loading, updateDev {item.ipAddress ?? 'N/A'} ), - 'connected': - (item)=>( - - - {item.connected ? 'Connected' : 'Not connected'} - - - ), 'refresh': (item)=>(