Merge branch 'application-mgt-new' into 'master'

Fix device loading issue in APPM store app view

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

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js

@@ -51,10 +51,10 @@ const columns = [
     },
     {
         title: 'Last Updated',
-        dataIndex: 'enrolmentInfo',
-        key: 'dateOfLastUpdate',
+        dataIndex: 'deviceInfo',
+        key: 'updatedTime',
         render: (data) => {
-            return (getTimeAgo(data.dateOfLastUpdate));
+            return data.updatedTime;
         }
         // todo add filtering options
     },
@@ -96,12 +96,6 @@ const columns = [
     },
 ];
 
-const getTimeAgo = (time) => {
-    const timeAgo = new TimeAgo('en-US');
-    return timeAgo.format(time);
-};
-
-
 class DeviceInstall extends React.Component {
     constructor(props) {
         super(props);

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js

@@ -51,10 +51,10 @@ const columns = [
     },
     {
         title: 'Last Updated',
-        dataIndex: 'enrolmentInfo',
-        key: 'dateOfLastUpdate',
+        dataIndex: 'deviceInfo',
+        key: 'updatedTime',
         render: (data) => {
-            return (getTimeAgo(data.dateOfLastUpdate));
+            return data.updatedTime;
         }
         // todo add filtering options
     },
@@ -96,11 +96,6 @@ const columns = [
     },
 ];
 
-const getTimeAgo = (time) => {
-    const timeAgo = new TimeAgo('en-US');
-    return timeAgo.format(time);
-};
-
 class DeviceUninstall extends React.Component {
     constructor(props) {
         super(props);