osh.silva
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Add infinite scroll to apps view in APPM store UI

See merge request entgra/carbon-device-mgt!363
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
parent 05babca6ba bd318d9af8
commit 62c900a6d9
7 changed files with 84 additions and 78 deletions
Show Stats Download Patch File Download Diff File

4
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.css
Unescape View File

@ -44,7 +44,7 @@
} }
} }
.background { .login .background {
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -56,7 +56,7 @@
animation: spin 200s infinite linear; animation: spin 200s infinite linear;
} }
.content { .login .content {
position: relative; position: relative;
z-index: 1; z-index: 1;
} }

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/Login.js vendored
Unescape View File

@ -31,7 +31,7 @@ class Login extends React.Component {
render() { render() {
const config = this.props.context; const config = this.props.context;
return ( return (
<div> <div className="login">
<div className="background"> <div className="background">
</div> </div>
<div className="content"> <div className="content">

18
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.css
Unescape View File

@ -87,21 +87,3 @@
} }
} }
@media only screen and (min-width: 760px) {
@media screen and (max-width: 1030px) {
Footer{
margin-bottom: 43%;
}
}
}
@media only screen and (min-width: 1030px) {
Footer{
margin-bottom: 5%;
}
}

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

@ -18,10 +18,13 @@
import React from "react"; import React from "react";
import AppCard from "./AppCard"; import AppCard from "./AppCard";
import {Col, message, notification, Row, Result, Skeleton, Alert} from "antd"; import {Col, Row, Result} from "antd";
import axios from "axios"; import axios from "axios";
import {withConfigContext} from "../../context/ConfigContext"; import {withConfigContext} from "../../context/ConfigContext";
import {handleApiError} from "../../js/Utils"; import {handleApiError} from "../../js/Utils";
import InfiniteScroll from "react-infinite-scroller";
const limit = 10;
class AppList extends React.Component { class AppList extends React.Component {
constructor(props) { constructor(props) {
@ -29,16 +32,24 @@ class AppList extends React.Component {
this.state = { this.state = {
apps: [], apps: [],
loading: true, loading: true,
hasMore: true,
loadMore: true,
forbiddenErrors: { forbiddenErrors: {
apps: false apps: false
} },
totalAppCount: 0
} }
} }
componentDidMount() { componentDidMount() {
const {deviceType} = this.props; const {deviceType} = this.props;
this.props.changeSelectedMenuItem(deviceType); this.props.changeSelectedMenuItem(deviceType);
this.fetchData(deviceType); this.fetchData(0, limit, res => {
this.setState({
apps: res,
loading: false
});
});
} }
@ -50,14 +61,19 @@ class AppList extends React.Component {
} }
} }
fetchData = (deviceType) => { fetchData = (offset, limit, callbackFunction) => {
const {deviceType} = this.props;
const config = this.props.context; const config = this.props.context;
const payload = {}; const payload = {
offset,
limit
};
if (deviceType === "web-clip") { if (deviceType === "web-clip") {
payload.appType = "WEB_CLIP"; payload.appType = "WEB_CLIP";
} else { } else {
payload.deviceType = deviceType; payload.deviceType = deviceType;
} }
this.setState({ this.setState({
loading: true loading: true
}); });
@ -69,10 +85,7 @@ class AppList extends React.Component {
if (res.status === 200) { if (res.status === 200) {
//todo remove this property check after backend improvement //todo remove this property check after backend improvement
let apps = (res.data.data.hasOwnProperty("applications")) ? res.data.data.applications : []; let apps = (res.data.data.hasOwnProperty("applications")) ? res.data.data.applications : [];
this.setState({ callbackFunction(apps);
apps: apps,
loading: false
})
} }
}).catch((error) => { }).catch((error) => {
@ -92,37 +105,65 @@ class AppList extends React.Component {
}); });
}; };
handleInfiniteOnLoad = (count) => {
const offset = count * limit;
let apps = this.state.apps;
this.setState({
loading: true,
});
this.fetchData(offset, limit, res => {
if (res.length > 0) {
apps = apps.concat(res);
this.setState({
apps,
loading: false,
});
} else {
this.setState({
hasMore: false,
loading: false
});
}
});
};
render() { render() {
const {apps, loading, forbiddenErrors} = this.state; const {apps, loading, forbiddenErrors, hasMore} = this.state;
return ( return (
<Skeleton loading={loading} active> <div>
<Row gutter={16}> <InfiniteScroll
{(forbiddenErrors.apps) && ( initialLoad={false}
<Result pageStart={0}
status="403" loadMore={this.handleInfiniteOnLoad}
title="403" hasMore={!loading && hasMore}
subTitle="You don't have permission to view apps." useWindow={true}>
// extra={<Button type="primary">Back Home</Button>} <Row gutter={16}>
/> {(forbiddenErrors.apps) && (
)} <Result
{!((forbiddenErrors.apps)) && apps.length === 0 && ( status="403"
<Result title="403"
status="404" subTitle="You don't have permission to view apps."
title="No apps, yet." />
subTitle="No apps available, yet! When the administration uploads, apps will show up here." )}
// extra={<Button type="primary">Back Home</Button>} {!(forbiddenErrors.apps) && apps.length === 0 && (
/> <Result
)} status="404"
{apps.map(app => ( title="No apps, yet."
<Col key={app.id} xs={12} sm={6} md={6} lg={4} xl={3}> subTitle="No apps available, yet! When the administration uploads, apps will show up here."
<AppCard key={app.id}
app={app}
/> />
</Col> )}
))} {apps.map(app => (
</Row> <Col key={app.id} xs={12} sm={6} md={6} lg={4} xl={3}>
</Skeleton> <AppCard key={app.id}
app={app}
/>
</Col>
))}
</Row>
</InfiniteScroll>
</div>
); );
} }
} }

4
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/Login.css
Unescape View File

@ -44,7 +44,7 @@
} }
} }
.background { .login .background {
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -56,7 +56,7 @@
animation: spin 200s infinite linear; animation: spin 200s infinite linear;
} }
.content { .login .content {
position: relative; position: relative;
z-index: 1; z-index: 1;
} }

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

@ -30,7 +30,7 @@ class Login extends React.Component {
render() { render() {
const config = this.props.context; const config = this.props.context;
return ( return (
<div> <div className="login">
<div className="background"> <div className="background">
</div> </div>
<div className="content"> <div className="content">

17
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.css
Unescape View File

@ -88,20 +88,3 @@
} }
} }
@media only screen and (min-width: 760px) {
@media screen and (max-width: 1030px) {
Footer{
margin-bottom: 45%;
}
}
}
@media only screen and (min-width: 1030px) {
Footer{
margin-bottom: 5%;
}
}
Write Preview
Loading…
Cancel
Save