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

Add refresh button to subscription details table

Browse Source
This commit is contained in:
Jayasanka 2019-10-26 13:04:02 +05:30
parent 9dd7444cd7
commit 6245e564a4
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppCard.js vendored
View File

@ -50,7 +50,7 @@ class AppCard extends React.Component {
</Col> </Col>
<Col span={24} style={{paddingTop:10}}> <Col span={24} style={{paddingTop:10}}>
<Text className="app-name" strong level={4}>{app.name}</Text><br/> <Text className="app-name" strong level={4}>{app.name}</Text><br/>
<Text type="secondary" level={4}>{app.subMethod.toLowerCase()}</Text><br/> <Text type="secondary" level={4}>{app.type.toLowerCase()}</Text><br/>
<StarRatings <StarRatings
rating={app.rating} rating={app.rating}
starRatedColor="#777" starRatedColor="#777"

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

@ -27,7 +27,7 @@ import AppUninstallModal from "./install/AppUninstallModal";
import {withConfigContext} from "../../../context/ConfigContext"; import {withConfigContext} from "../../../context/ConfigContext";
import {handleApiError} from "../../../js/Utils"; import {handleApiError} from "../../../js/Utils";
import ReviewContainer from "./review/ReviewContainer"; import ReviewContainer from "./review/ReviewContainer";
import InstalledDevicesTable from "./InstalledDevicesTable"; import SubscriptionDetails from "./SubscriptionDetails";
const {Title, Text, Paragraph} = Typography; const {Title, Text, Paragraph} = Typography;
const {TabPane} = Tabs; const {TabPane} = Tabs;
@ -205,7 +205,7 @@ class ReleaseView extends React.Component {
<ReviewContainer uuid={release.uuid}/> <ReviewContainer uuid={release.uuid}/>
</TabPane> </TabPane>
<TabPane tab="Subscription Details" key="2"> <TabPane tab="Subscription Details" key="2">
<InstalledDevicesTable uuid={release.uuid}/> <SubscriptionDetails uuid={release.uuid}/>
</TabPane> </TabPane>
</Tabs> </Tabs>
</div> </div>

24
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/InstalledDevicesTable.js → components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/SubscriptionDetails.js vendored
View File

@ -53,7 +53,16 @@ const columns = [
title: 'Action', title: 'Action',
dataIndex: 'action', dataIndex: 'action',
key: 'action', key: 'action',
render: action => action.toLowerCase() render: action => {
action = action.toLowerCase();
let color = "fff";
if(action==="subscribed"){
color = "#6ab04c"
}else if(action === "unsubscribed"){
color = "#f0932b"
}
return <span style={{color:color}}>{action}</span>
}
}, },
{ {
title: 'Triggered By', title: 'Triggered By',
@ -128,7 +137,7 @@ const getTimeAgo = (time) => {
}; };
class InstalledDevicesTable extends React.Component { class SubscriptionDetails extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
config = this.props.context; config = this.props.context;
@ -171,12 +180,10 @@ class InstalledDevicesTable extends React.Component {
`/admin/subscription/${this.props.uuid}?` + encodedExtraParams, `/admin/subscription/${this.props.uuid}?` + encodedExtraParams,
).then(res => { ).then(res => {
if (res.status === 200) { if (res.status === 200) {
const pagination = {...this.state.pagination};
console.log(res.data.data.data); console.log(res.data.data.data);
this.setState({ this.setState({
loading: false, loading: false,
data: res.data.data.data, data: res.data.data.data
pagination,
}); });
} }
@ -195,6 +202,11 @@ class InstalledDevicesTable extends React.Component {
The following are the subscription details of the application in each respective device. The following are the subscription details of the application in each respective device.
</Text> </Text>
</div> </div>
<div style={{textAlign: "right", paddingBottom: 6}}>
<Button icon="sync" onClick={this.fetch}>
Refresh
</Button>
</div>
<Table <Table
columns={columns} columns={columns}
rowKey={record => (record.device.deviceIdentifier + record.device.enrolmentInfo.owner + record.device.enrolmentInfo.ownership)} rowKey={record => (record.device.deviceIdentifier + record.device.enrolmentInfo.owner + record.device.enrolmentInfo.ownership)}
@ -214,4 +226,4 @@ class InstalledDevicesTable extends React.Component {
} }
} }
export default withConfigContext(InstalledDevicesTable); export default withConfigContext(SubscriptionDetails);