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 'jayasanka-appmgt' into 'master'

Browse Source 
Jayasanka appmgt

See merge request entgra/carbon-device-mgt!370
This commit is contained in:
Inosh Perara 2019-10-31 09:34:43 +00:00
commit 86da88e92c
2 changed files with 11 additions and 4 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.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js vendored
View File

@ -344,7 +344,7 @@ class NewAppDetailsForm extends React.Component {
banner banner
closable/> closable/>
)} )}
<Form.Item {...formItemLayout} label="Unrestricted Roles"> <Form.Item {...formItemLayout} label="Visible Roles">
{getFieldDecorator('unrestrictedRoles', { {getFieldDecorator('unrestrictedRoles', {
rules: [], rules: [],
initialValue: [] initialValue: []

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

@ -24,7 +24,7 @@ import {withConfigContext} from "../../context/ConfigContext";
import {handleApiError} from "../../js/Utils"; import {handleApiError} from "../../js/Utils";
import InfiniteScroll from "react-infinite-scroller"; import InfiniteScroll from "react-infinite-scroller";
const limit = 10; const limit = 30;
class AppList extends React.Component { class AppList extends React.Component {
constructor(props) { constructor(props) {
@ -44,7 +44,7 @@ class AppList extends React.Component {
componentDidMount() { componentDidMount() {
const {deviceType} = this.props; const {deviceType} = this.props;
this.props.changeSelectedMenuItem(deviceType); this.props.changeSelectedMenuItem(deviceType);
this.fetchData(0, limit, res => { this.fetchData(0, 30, res => {
this.setState({ this.setState({
apps: res, apps: res,
loading: false loading: false
@ -57,7 +57,13 @@ class AppList extends React.Component {
if (prevProps.deviceType !== this.props.deviceType) { if (prevProps.deviceType !== this.props.deviceType) {
const {deviceType} = this.props; const {deviceType} = this.props;
this.props.changeSelectedMenuItem(deviceType); this.props.changeSelectedMenuItem(deviceType);
this.fetchData(deviceType); this.fetchData(0, 30, res => {
this.setState({
apps: res,
loading: false,
hasMore: true
});
});
} }
} }
@ -134,6 +140,7 @@ class AppList extends React.Component {
return ( return (
<div> <div>
<InfiniteScroll <InfiniteScroll
key={this.props.deviceType}
initialLoad={false} initialLoad={false}
pageStart={0} pageStart={0}
loadMore={this.handleInfiniteOnLoad} loadMore={this.handleInfiniteOnLoad}