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

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

Browse Source 
Fix device loading issue in APPM store app view

See merge request entgra/carbon-device-mgt!381
This commit is contained in:
Saad Sahibjan 2019-11-05 10:08:22 +00:00
commit 76ff05d153
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,10 +51,10 @@ const columns = [
}, },
{ {
title: 'Last Updated', title: 'Last Updated',
dataIndex: 'enrolmentInfo', dataIndex: 'deviceInfo',
key: 'dateOfLastUpdate', key: 'updatedTime',
render: (data) => { render: (data) => {
return (getTimeAgo(data.dateOfLastUpdate)); return data.updatedTime;
} }
// todo add filtering options // 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 { class DeviceInstall extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);

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

@ -51,10 +51,10 @@ const columns = [
}, },
{ {
title: 'Last Updated', title: 'Last Updated',
dataIndex: 'enrolmentInfo', dataIndex: 'deviceInfo',
key: 'dateOfLastUpdate', key: 'updatedTime',
render: (data) => { render: (data) => {
return (getTimeAgo(data.dateOfLastUpdate)); return data.updatedTime;
} }
// todo add filtering options // 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 { class DeviceUninstall extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);