From 97a03a1aa1a78092dff474663a8fad56d364d5f9 Mon Sep 17 00:00:00 2001 From: Jayasanka Weerasinghe Date: Tue, 5 Nov 2019 10:08:22 +0000 Subject: [PATCH] Add minor UI fixes to APPM UI The following changes are with this commit - Display wrong credentials error in Login form - Display tags and categories in APPM store release view --- .../components/apps/release/install/DeviceInstall.js | 12 +++--------- .../apps/release/install/DeviceUninstall.js | 11 +++-------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js index ed69db96ef..8850e84394 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js +++ b/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); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js index fa449ccd37..a8533ef663 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceUninstall.js +++ b/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);