From efd7b34e609376b7d0940705d9f6bac82b7e24ba Mon Sep 17 00:00:00 2001
From: Amanda <74random.amanda@gmail.com>
Date: Sat, 14 Mar 2020 11:23:12 +0530
Subject: [PATCH] Add OSVersion column to DevicesTable component

---
 .../Reports/components/DevicesTable/index.js    | 17 +++++++++++------
 .../src/scenes/Home/scenes/Reports/index.js     |  2 +-
 .../Reports/scenes/OutdatedOSVersion/index.js   |  8 ++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/components/DevicesTable/index.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/components/DevicesTable/index.js
index 8be97a11b11..bc283b737dd 100644
--- a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/components/DevicesTable/index.js
+++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/components/DevicesTable/index.js
@@ -116,12 +116,6 @@ const columns = [
     },
     // todo add filtering options
   },
-  {
-    title: 'OS Version',
-    dataIndex: 'deviceInfo',
-    key: 'osVersion',
-    render: deviceInfo => deviceInfo.osVersion,
-  },
 ];
 
 const getTimeAgo = time => {
@@ -185,6 +179,17 @@ class deviceTable extends React.Component {
       .then(res => {
         if (res.status === 200) {
           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({
             loading: false,
             data: res.data.data,
diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/index.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/index.js
index 2963289c4fe..5a15b832419 100644
--- a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/index.js
+++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/index.js
@@ -178,7 +178,7 @@ class Reports extends React.Component {
                           style={{ fontSize: '25px', color: '#08c' }}
                         />
                         <h2>
-                          <b>Expired Devices Report</b>
+                          <b>Outdated OS Version Report</b>
                         </h2>
                         <p>Report based on device OS version</p>
                       </div>
diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/scenes/OutdatedOSVersion/index.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/scenes/OutdatedOSVersion/index.js
index a5955f4472c..fca5ca7534a 100644
--- a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/scenes/OutdatedOSVersion/index.js
+++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/scenes/Home/scenes/Reports/scenes/OutdatedOSVersion/index.js
@@ -121,10 +121,14 @@ class OutdatedOSversionReport extends React.Component {
             <Breadcrumb.Item>
               <Link to="/entgra/reports">Reports</Link>
             </Breadcrumb.Item>
-            <Breadcrumb.Item>Expired Devices</Breadcrumb.Item>
+            <Breadcrumb.Item>Outdated OS Version</Breadcrumb.Item>
           </Breadcrumb>
           <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' }}>
               <Select
                 showSearch