Add ui improvements to APPM Publisher UI

The following changes are with this commit
- View subscription status of devices in release view
- Display server error response in add new app form

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js

@@ -54,7 +54,8 @@ class AddNewAppFormComponent extends React.Component {
             release: null,
             isError: false,
             deviceType: null,
-            supportedOsVersions: []
+            supportedOsVersions: [],
+            errorText: ""
         };
     }
 
@@ -112,11 +113,12 @@ class AddNewAppFormComponent extends React.Component {
             }
 
         }).catch((error) => {
-            handleApiError(error, "Sorry, we were unable to complete your request.")
+            handleApiError(error, error.response.data.data);
             this.setState({
                 loading: false,
                 isError: true,
-                current: 2
+                current: 2,
+                errorText: error.response.data.data
             });
         });
 
@@ -149,7 +151,7 @@ class AddNewAppFormComponent extends React.Component {
     };
 
     render() {
-        const {loading, current, isError, supportedOsVersions} = this.state;
+        const {loading, current, isError, supportedOsVersions, errorText} = this.state;
         const {formConfig} = this.props;
         return (
             <div>
@@ -190,7 +192,7 @@ class AddNewAppFormComponent extends React.Component {
 
                                     {isError && (<Result
                                         status="500"
-                                        title="Error occurred while creating the application."
+                                        title={errorText}
                                         subTitle="Go back to edit the details and submit again."
                                         extra={<Button onClick={this.onClickBackButton}>Back</Button>}
                                     />)}

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

@@ -32,29 +32,72 @@ let config = null;
 const columns = [
     {
         title: 'Device',
-        dataIndex: 'name',
+        dataIndex: 'device',
         width: 100,
+        render: device => device.name
     },
     {
         title: 'Owner',
-        dataIndex: 'enrolmentInfo',
+        dataIndex: 'device',
         key: 'owner',
-        render: enrolmentInfo => enrolmentInfo.owner
+        render: device => device.enrolmentInfo.owner
-        // todo add filtering options
     },
     {
-        title: 'Ownership',
+        title: 'Action Type',
-        dataIndex: 'enrolmentInfo',
+        dataIndex: 'actionType',
-        key: 'ownership',
+        key: 'actionType',
-        render: enrolmentInfo => enrolmentInfo.ownership
+        render: actionType => actionType.toLowerCase()
-        // todo add filtering options
     },
     {
-        title: 'Status',
+        title: 'Action',
-        dataIndex: 'enrolmentInfo',
+        dataIndex: 'action',
-        key: 'status',
+        key: 'action',
-        render: (enrolmentInfo) => {
+        render: action => action.toLowerCase()
-            const status = enrolmentInfo.status.toLowerCase();
+    },
+    {
+        title: 'Triggered By',
+        dataIndex: 'actionTriggeredBy',
+        key: 'actionTriggeredBy'
+    },
+    {
+        title: 'Action Triggered At',
+        dataIndex: 'actionTriggeredTimestamp',
+        key: 'actionTriggeredTimestamp'
+    },
+    {
+        title: 'Action Status',
+        dataIndex: 'status',
+        key: 'actionStatus',
+        render: (status) => {
+            let color = "#f9ca24";
+            switch (status) {
+                case "COMPLETED":
+                    color = "#badc58";
+                    break;
+                case "REPEATED":
+                    color = "#6ab04c";
+                    break;
+                case "ERROR":
+                case "INVALID":
+                case "UNAUTHORIZED":
+                    color = "#ff7979";
+                    break;
+                case "IN_PROGRESS":
+                    color = "#f9ca24";
+                    break;
+                case "PENDING":
+                    color = "#636e72";
+                    break;
+            }
+            return <Tag color={color}>{status.toLowerCase()}</Tag>;
+        }
+    },
+    {
+        title: 'Device Status',
+        dataIndex: 'device',
+        key: 'deviceStatus',
+        render: (device) => {
+            const status = device.enrolmentInfo.status.toLowerCase();
             let color = "#f9ca24";
             switch (status) {
                 case "active":
@@ -75,18 +118,6 @@ const columns = [
             }
             return <Tag color={color}>{status}</Tag>;
         }
-        // todo add filtering options
-    },
-    {
-        title: 'Last Updated',
-        dataIndex: 'enrolmentInfo',
-        key: 'dateOfLastUpdate',
-        render: (data) => {
-            const {dateOfLastUpdate} = data;
-            const timeAgoString = getTimeAgo(dateOfLastUpdate);
-            return <Tooltip title={new Date(dateOfLastUpdate).toString()}>{timeAgoString}</Tooltip>;
-        }
-        // todo add filtering options
     }
 ];
 
@@ -135,14 +166,15 @@ class InstalledDevicesTable extends React.Component {
         //send request to the invoker
         axios.get(
             window.location.origin + config.serverConfig.invoker.uri +
-            config.serverConfig.invoker.deviceMgt +
+            config.serverConfig.invoker.store +
-            "/devices?" + encodedExtraParams,
+            `/admin/subscription/${this.props.uuid}?` + encodedExtraParams,
         ).then(res => {
             if (res.status === 200) {
                 const pagination = {...this.state.pagination};
+                console.log(res.data.data.data);
                 this.setState({
                     loading: false,
-                    data: res.data.data.devices,
+                    data: res.data.data.data,
                     pagination,
                 });
             }
@@ -169,7 +201,7 @@ class InstalledDevicesTable extends React.Component {
         const {data, pagination, loading, selectedRows} = this.state;
         return (
             <div>
-                <div style={{paddingBottom:24}}>
+                <div style={{paddingBottom: 24}}>
                     <Text>
                         Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque
                         laudantium,
@@ -179,7 +211,7 @@ class InstalledDevicesTable extends React.Component {
                 </div>
                 <Table
                     columns={columns}
-                    rowKey={record => (record.deviceIdentifier + record.enrolmentInfo.owner + record.enrolmentInfo.ownership)}
+                    rowKey={record => (record.device.deviceIdentifier + record.device.enrolmentInfo.owner + record.device.enrolmentInfo.ownership)}
                     dataSource={data}
                     pagination={{
                         ...pagination,

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

@@ -208,7 +208,7 @@ class ReleaseView extends React.Component {
                             <ReviewContainer uuid={release.uuid}/>
                         </TabPane>
                         <TabPane tab="Installed devices" key="2">
-                            <InstalledDevicesTable/>
+                            <InstalledDevicesTable uuid={release.uuid}/>
                         </TabPane>
                     </Tabs>
                 </div>