feature/appm-store/pbac
Jayasanka 6 years ago
parent 1b3390f1b9
commit 6ce3eceb70

@ -16,10 +16,11 @@
"react": "^16.8.4", "react": "^16.8.4",
"react-dom": "^16.8.4", "react-dom": "^16.8.4",
"react-highlight-words": "^0.16.0", "react-highlight-words": "^0.16.0",
"react-router": "latest",
"react-router-config": "^5.0.0", "react-router-config": "^5.0.0",
"react-router-dom": "latest", "react-router-dom": "latest",
"react-scripts": "2.1.8", "react-scripts": "2.1.8",
"react-router": "latest" "redux-thunk": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.0.0", "@babel/core": "^7.0.0",

@ -32,7 +32,7 @@ class AppCard extends React.Component {
<Card style={{marginTop: 16 }} actions={[<Icon type="edit" />, <Icon type="close" />, <Icon type="ellipsis" />]}> <Card style={{marginTop: 16 }} actions={[<Icon type="edit" />, <Icon type="close" />, <Icon type="ellipsis" />]}>
<Meta <Meta
avatar={<Avatar src={icon} />} avatar={<Avatar src={icon} />}
title={this.props.title} title={this.props.name}
description={description} description={description}
/> />
</Card> </Card>

@ -2,6 +2,7 @@ import React from "react";
import AppCard from "./AppCard"; import AppCard from "./AppCard";
import {Col, Row} from "antd"; import {Col, Row} from "antd";
import {connect} from "react-redux"; import {connect} from "react-redux";
import {getApps} from "../js/actions";
// connecting state.articles with the component // connecting state.articles with the component
const mapStateToProps= state => { const mapStateToProps= state => {
@ -13,13 +14,17 @@ class ConnectedAppList extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
} }
componentDidMount() {
this.props.getApps();
}
render() { render() {
return ( return (
<Row gutter={16}> <Row gutter={16}>
{this.props.apps.map(app => ( {this.props.apps.map(app => (
<Col key={app.id} xs={24} sm={12} md={6} lg={6}> <Col key={app.id} xs={24} sm={12} md={6} lg={6}>
<AppCard key={app.id} title={app.title} <AppCard key={app.id}
name={app.name}
platform={app.platform} platform={app.platform}
type={app.type} type={app.type}
subType={app.subType} subType={app.subType}
@ -31,6 +36,6 @@ class ConnectedAppList extends React.Component {
} }
} }
const AppList = connect(mapStateToProps)(ConnectedAppList); const AppList = connect(mapStateToProps,{getApps})(ConnectedAppList);
export default AppList; export default AppList;

@ -9,7 +9,6 @@ import AddNewApp from "./pages/dashboard/add-new-app/AddNewApp";
import './index.css'; import './index.css';
import store from "./js/store/index"; import store from "./js/store/index";
import {Provider} from "react-redux"; import {Provider} from "react-redux";
import {Switch} from "react-router";
const routes = [ const routes = [

@ -2,15 +2,29 @@ import axios from "axios";
import {GET_APPS} from "../constants/action-types"; import {GET_APPS} from "../constants/action-types";
export function getApps() { export function getApps() {
axios.post('https://localhost:9443/api/application-mgt-handler/v1.0/invoke', request
).then(res => { return (dispatch) => {
if(res.status === 200){ const request = "method=post&content-type=application/json&payload={}&api-endpoint=/application-mgt-publisher/v1.0/applications";
return {type: GET_APPS, payload : res.data}
} return axios.post('https://localhost:9443/api/application-mgt-handler/v1.0/invoke', request
).then(res => {
}).catch(function (error) { if (res.status === 200) {
if(error.response.status === 401){ let apps = [];
window.location.href = 'https://localhost:9443/publisher/login';
} if(res.data.data.hasOwnProperty("applications")){
}); apps = res.data.data.applications;
}
console.log(res.data);
dispatch({type: GET_APPS, payload: apps});
}
}).catch(function (error) {
if (error.response.status === 401) {
window.location.href = 'https://localhost:9443/publisher/login';
}
});
};
} }

@ -1,28 +1,14 @@
import {GET_APPS} from "../constants/action-types"; import {GET_APPS} from "../constants/action-types";
const initialState = { const initialState = {
apps: [{ apps: []
id: 1,
title: 'Hi',
platform: 'android',
description: 'lorem',
subType: 'FREE',
type: 'ENTERPRISE'
},
{
id: 2,
title: 'Hi',
platform: 'android',
description: 'lorem',
subType: 'FREE',
type: 'ENTERPRISE'
}]
}; };
function rootReducer(state = initialState, action) { function rootReducer(state = initialState, action) {
if (action.type === GET_APPS) { if (action.type === GET_APPS) {
console.log(11);
return Object.assign({}, state, { return Object.assign({}, state, {
apps: state.apps.concat(action.payload) apps: action.payload
}); });
} }
return state; return state;

@ -1,4 +1,5 @@
import { createStore } from "redux"; import { createStore, applyMiddleware } from "redux";
import rootReducer from "../reducers/index"; import rootReducer from "../reducers/index";
const store = createStore(rootReducer); import thunk from "redux-thunk";
const store = createStore(rootReducer, applyMiddleware(thunk));
export default store; export default store;

@ -1,8 +1,6 @@
import React from "react"; import React from "react";
import "antd/dist/antd.css"; import "antd/dist/antd.css";
import {PageHeader, Typography,Input, Button, Row, Col} from "antd"; import {PageHeader, Typography,Input, Button, Row, Col} from "antd";
import AppCard from "../../../components/AppCard";
import AppList from "../../../components/AppList"; import AppList from "../../../components/AppList";
const Search = Input.Search; const Search = Input.Search;

Loading…
Cancel
Save