community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add OSVersion column to DevicesTable component

Browse Source
This commit is contained in:
Amanda 2020-03-14 11:23:12 +05:30
parent 1201ae0e1e
commit efd7b34e60
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/components/DevicesTable/index.js vendored
View File

@ -116,12 +116,6 @@ const columns = [
}, },
// todo add filtering options // todo add filtering options
}, },
{
title: 'OS Version',
dataIndex: 'deviceInfo',
key: 'osVersion',
render: deviceInfo => deviceInfo.osVersion,
},
]; ];
const getTimeAgo = time => { const getTimeAgo = time => {
@ -185,6 +179,17 @@ class deviceTable extends React.Component {
.then(res => { .then(res => {
if (res.status === 200) { if (res.status === 200) {
const pagination = { ...this.state.pagination }; const pagination = { ...this.state.pagination };
if (
res.data.data.devices.length &&
res.data.data.devices[0].hasOwnProperty('deviceInfo')
) {
columns.push({
title: 'OS Version',
dataIndex: 'deviceInfo',
key: 'osVersion',
render: deviceInfo => deviceInfo.osVersion,
});
}
this.setState({ this.setState({
loading: false, loading: false,
data: res.data.data, data: res.data.data,

2
components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/index.js vendored
View File

@ -178,7 +178,7 @@ class Reports extends React.Component {
style={{ fontSize: '25px', color: '#08c' }} style={{ fontSize: '25px', color: '#08c' }}
/> />
<h2> <h2>
<b>Expired Devices Report</b> <b>Outdated OS Version Report</b>
</h2> </h2>
<p>Report based on device OS version</p> <p>Report based on device OS version</p>
</div> </div>

8
components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/scenes/OutdatedOSVersion/index.js vendored
View File

@ -121,10 +121,14 @@ class OutdatedOSversionReport extends React.Component {
<Breadcrumb.Item> <Breadcrumb.Item>
<Link to="/entgra/reports">Reports</Link> <Link to="/entgra/reports">Reports</Link>
</Breadcrumb.Item> </Breadcrumb.Item>
<Breadcrumb.Item>Expired Devices</Breadcrumb.Item> <Breadcrumb.Item>Outdated OS Version</Breadcrumb.Item>
</Breadcrumb> </Breadcrumb>
<div className="wrap" style={{ marginBottom: '10px' }}> <div className="wrap" style={{ marginBottom: '10px' }}>
<h3>Expired Devices Report</h3> <h3>Outdated OS Version Report</h3>
<p>
This report displays devices with an OS Version below the
specified version.
</p>
<div className="wrap" style={{ marginBottom: '10px' }}> <div className="wrap" style={{ marginBottom: '10px' }}>
<Select <Select
showSearch showSearch