Merge branch 'report-mgt' into 'master'

Add OSVersion column to DevicesTable component

See merge request entgra/carbon-device-mgt!459

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,

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>

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