From ef224a75dcadecd64b67423dedd8910f196d0815 Mon Sep 17 00:00:00 2001 From: Jayasanka Date: Wed, 19 Jun 2019 23:05:55 +0530 Subject: [PATCH] Fix remaining api calls in APPM UI --- .../react-app/src/App.js | 1 - .../apps/detailed-rating/DetailedRating.js | 6 +---- .../apps/list-apps/AppDetailsDrawer.js | 1 - .../components/apps/list-apps/AppsTable.js | 4 +--- .../src/components/apps/list-apps/ListApps.js | 3 +-- .../components/apps/release/LifecycleModal.js | 2 -- .../components/apps/release/ReleaseView.js | 2 +- .../components/apps/release/review/Reviews.js | 4 ++-- .../apps/release/temp/LifeCycleGraph.js | 2 +- .../manage/categories/ManageCategories.js | 1 - .../manage/categories/ManageTags.js | 1 - .../pages/dashboard/add-new-app/AddNewApp.js | 1 - .../src/pages/dashboard/add-new-app/Step3.js | 1 - .../src/pages/dashboard/apps/Apps-old.js | 2 +- .../pages/dashboard/apps/release/Release.js | 3 +-- .../react-app/public/conf/config.json | 6 +++++ .../react-app/src/components/apps/AppList.js | 6 +++-- .../components/apps/release/DetailedRating.js | 23 ++++++++++--------- .../components/apps/release/ReleaseView.js | 13 ++++++----- .../apps/release/install/AppInstallModal.js | 2 +- .../apps/release/install/DeviceInstall.js | 7 +++--- .../apps/release/install/GroupInstall.js | 8 ++----- .../apps/release/install/RoleInstall.js | 8 ++----- .../apps/release/install/UserInstall.js | 5 +--- .../apps/release/review/AddReview.js | 8 +++++-- .../components/apps/release/review/Reviews.js | 11 ++++++--- .../src/pages/dashboard/Dashboard.js | 2 -- .../pages/dashboard/apps/release/Release.js | 7 ++---- 28 files changed, 63 insertions(+), 77 deletions(-) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js index 9c532989fac..2f6d2d164ff 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js @@ -15,7 +15,6 @@ class App extends React.Component { } render() { - console.log(this.routes); return (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js index 65dddd9e68a..9742266cf3a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/detailed-rating/DetailedRating.js @@ -30,6 +30,7 @@ class DetailedRating extends React.Component{ } getData = (type, uuid)=>{ + console.log(); return axios.get( config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+uuid+"/"+type+"-rating", @@ -38,7 +39,6 @@ class DetailedRating extends React.Component{ }).then(res => { if (res.status === 200) { let detailedRating = res.data.data; - console.log(type,uuid); this.setState({ detailedRating }) @@ -48,15 +48,12 @@ class DetailedRating extends React.Component{ if (error.response.status === 401) { window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort+'/publisher/login'; } - - console.log(error); }); }; render() { const detailedRating = this.state.detailedRating; - console.log(detailedRating); if(detailedRating ==null){ return null; @@ -81,7 +78,6 @@ class DetailedRating extends React.Component{ } } - console.log(ratingBarPercentages); return ( diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer.js index df3550bee80..094db7aae96 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer.js @@ -12,7 +12,6 @@ class AppDetailsDrawer extends React.Component { if (app == null) { return null; } - console.log(app); return (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppsTable.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppsTable.js index 3e04a6bde30..d99cccd8f74 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppsTable.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppsTable.js @@ -113,8 +113,7 @@ class AppsTable extends React.Component { const data = { }; - console.log(config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/applications?"+encodedExtraParams); - axios.post( + axios.post( config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.publisher+"/applications?"+encodedExtraParams, data, { @@ -152,7 +151,6 @@ class AppsTable extends React.Component { }; render() { - console.log("rendered"); return ( { - console.log(app); this.setState({ isDrawerVisible: true, selectedApp: app @@ -56,7 +55,7 @@ class ConnectedListApps extends React.Component { console.log(value)} + // onSearch={value => console.log(value)} style={{width: 200}} /> diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js index 646cbd9aea3..df239546e3e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js @@ -62,8 +62,6 @@ class ConnectedLifecycleModal extends React.Component { handleSubmit = event => { this.setState({ loading: true }); event.preventDefault(); - console.log(this.reason); - console.log("uuid", this.props.uuid); this.props.updateLifecycleState(this.props.uuid, this.props.nextState, this.reason.state.value) }; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js index fa26482f0de..5764b8ce9aa 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js @@ -72,7 +72,7 @@ class ReleaseView extends React.Component { - + ); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js index 2d173c771c0..db2b69c52df 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js @@ -28,10 +28,10 @@ class Reviews extends React.Component { fetchData = (offset, limit, callback) => { - const {uuid} = this.props; + const {uuid, type} = this.props; axios.get( - config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/app/"+uuid, + config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+type+"/"+uuid, { headers: {'X-Platform': config.serverConfig.platform} }).then(res => { diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js index fc25a9b306b..0301d8c8efc 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/temp/LifeCycleGraph.js @@ -92,7 +92,7 @@ function connectNodes(nodeFrom, nodeTo) { } function f() { - console.log(1); + // console.log(1); } export default LifeCycleGraph; \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js index e27fc497eb3..072ad720c58 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js @@ -241,7 +241,6 @@ class ManageCategories extends React.Component { saveInputRef = input => (this.input = input); closeEditModal = e => { - console.log(e); this.setState({ isEditModalVisible: false, currentlyEditingId: null diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js index 5e1cc407faf..c5251527070 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js @@ -240,7 +240,6 @@ class ManageTags extends React.Component { saveInputRef = input => (this.input = input); closeEditModal = e => { - console.log(e); this.setState({ isEditModalVisible: false, currentlyEditingId: null diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js index 3965c506c63..b20456d2a7c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/AddNewApp.js @@ -98,7 +98,6 @@ class EditableTagGroup extends React.Component { handleClose = (removedTag) => { const tags = this.state.tags.filter(tag => tag !== removedTag); - console.log(tags); this.setState({tags}); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/Step3.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/Step3.js index 6ddba9f8e21..e9339ed0a5a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/Step3.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/add-new-app/Step3.js @@ -2,7 +2,6 @@ import React from "react" class Step3 extends React.Component { render() { - console.log("hhhoohh"); return (

tttoooeeee

); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps-old.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps-old.js index e24f40a6eae..4a740f73e31 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps-old.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/Apps-old.js @@ -41,7 +41,7 @@ class Apps extends React.Component { console.log(value)} + // onSearch={value => console.log(value)} style={{ width: 200}} /> diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js index 61df8634977..a9a18c6e4aa 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/apps/release/Release.js @@ -53,14 +53,13 @@ class Release extends React.Component { //send request to the invoker axios.get( - config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store + "/applications/" + uuid, + config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/release/"+ uuid, { headers: {'X-Platform': config.serverConfig.platform} } ).then(res => { if (res.status === 200) { let app = res.data.data; - console.log(app); this.setState({ app: app, loading: false, diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json index 706fe7cbd7c..642b3fdf38c 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/public/conf/config.json @@ -8,6 +8,12 @@ "hostname": "localhost", "httpsPort": "9443", "invokerUri": "/ui-request-handler/invoke/application-mgt-store/v1.0", + "invoker": { + "uri": "/ui-request-handler/invoke", + "publisher": "/application-mgt-publisher/v1.0", + "store": "/application-mgt-store/v1.0", + "admin" : "" + }, "loginUri": "/ui-request-handler/login", "platform": "store" }, diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js index d04af62794b..5bfbea3572b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/AppList.js @@ -37,9 +37,11 @@ class AppList extends React.Component { payload.deviceType= deviceType; } + console.log("b",config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store+"/applications/"); + //send request to the invoker axios.post( - config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri+"/applications/", + config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store+"/applications/", payload, { headers: { 'X-Platform': config.serverConfig.platform } @@ -54,7 +56,7 @@ class AppList extends React.Component { }) } - }).catch((error) => { + }).catch((error) => { console.log(error.response); if (error.hasOwnProperty("response") && error.response.status === 401) { //todo display a popup with error message.error('You are not logged in'); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.js index f8dc026b8e7..6b054fbf34b 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/DetailedRating.js @@ -1,12 +1,13 @@ import React from "react"; import {Row, Typography, Icon} from "antd"; import StarRatings from "react-star-ratings"; -import axios from "axios"; import "./DetailedRating.css"; import config from "../../../../public/conf/config.json"; +import axios from "axios"; const { Text } = Typography; + class DetailedRating extends React.Component{ constructor(props){ @@ -17,20 +18,24 @@ class DetailedRating extends React.Component{ } componentDidMount() { - this.getData(this.props.uuid); + const {type,uuid} = this.props; + this.getData(type,uuid); } componentDidUpdate(prevProps, prevState) { if (prevProps.uuid !== this.props.uuid) { - this.getData(this.props.uuid); + const {type,uuid} = this.props; + this.getData(type,uuid); } } - getData = (uuid)=>{ - const request = "method=get&content-type=application/json&payload={}&api-endpoint=/application-mgt-store/v1.0/reviews/"+uuid+"/rating"; + getData = (type, uuid)=>{ - return axios.post(config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request - ).then(res => { + return axios.get( + config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+uuid+"/"+type+"-rating", + { + headers: { 'X-Platform': config.serverConfig.platform } + }).then(res => { if (res.status === 200) { let detailedRating = res.data.data; this.setState({ @@ -48,8 +53,6 @@ class DetailedRating extends React.Component{ render() { const detailedRating = this.state.detailedRating; - console.log(detailedRating); - if(detailedRating ==null){ return null; } @@ -73,8 +76,6 @@ class DetailedRating extends React.Component{ } } - console.log(ratingBarPercentages); - return (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js index ea96028b805..e52ddff1928 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/ReleaseView.js @@ -21,14 +21,14 @@ class ReleaseView extends React.Component { } } - installApp = (type,payload) => { + installApp = (type, payload) => { const {uuid} = this.props.release; const parameters = { method: "post", 'content-type': "application/json", payload: JSON.stringify(payload), - 'api-endpoint': "/application-mgt-store/v1.0/subscription/install/" + uuid + "/"+type+"/install" + 'api-endpoint': "/application-mgt-store/v1.0/subscription/install/" + uuid + "/" + type + "/install" }; const request = Object.keys(parameters).map(key => key + '=' + parameters[key]).join('&'); @@ -36,7 +36,7 @@ class ReleaseView extends React.Component { loading: true, }); - axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request + axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store, request ).then(res => { if (res.status === 201) { this.setState({ @@ -60,8 +60,9 @@ class ReleaseView extends React.Component { } }).catch((error) => { + console.log(error); if (error.response.status === 401) { - window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort+'/store/login'; + window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + '/store/login'; } else { this.setState({ loading: false, @@ -133,13 +134,13 @@ class ReleaseView extends React.Component { REVIEWS
- + - + ); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppInstallModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppInstallModal.js index 990eea393e8..4567bceb218 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppInstallModal.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/AppInstallModal.js @@ -21,7 +21,7 @@ class AppInstallModal extends React.Component{ onCancel={this.props.onClose} footer={null} > - {console.log("changed");}}> + diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js index c1c7a5f2e53..4f4b7be7fee 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/DeviceInstall.js @@ -95,7 +95,7 @@ class DeviceInstall extends React.Component { rowSelection = { onChange: (selectedRowKeys, selectedRows) => { - console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); + // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); this.setState({ selectedRows: selectedRows }) @@ -138,11 +138,10 @@ class DeviceInstall extends React.Component { const request = Object.keys(parameters).map(key => key + '=' + parameters[key]).join('&'); //send request to the invoker - axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request + axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store, request ).then(res => { if (res.status === 200) { const pagination = {...this.state.pagination}; - console.log(res.data.data.devices); this.setState({ loading: false, data: res.data.data.devices, @@ -151,7 +150,7 @@ class DeviceInstall extends React.Component { } - }).catch((error) => { + }).catch((error) => { console.log(error); if (error.hasOwnProperty("status") && error.response.status === 401) { //todo display a popop with error message.error('You are not logged in'); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js index 535fefec220..82e2de759cb 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/GroupInstall.js @@ -35,9 +35,7 @@ class GroupInstall extends React.Component { 'api-endpoint': "/device-mgt/v1.0/admin/groups?name=" + value }; - const request = Object.keys(parameters).map(key => key + '=' + parameters[key]).join('&'); - console.log(request); - axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request + axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store, request ).then(res => { if (res.status === 200) { if (fetchId !== this.lastFetchId) { @@ -45,8 +43,6 @@ class GroupInstall extends React.Component { return; } - console.log(res.data.data); - const data = res.data.data.deviceGroups.map(group => ({ text: group.name, value: group.name, @@ -55,7 +51,7 @@ class GroupInstall extends React.Component { this.setState({data, fetching: false}); } - }).catch((error) => { + }).catch((error) => { console.log(error); if (error.hasOwnProperty("status") && error.response.status === 401) { message.error('You are not logged in'); window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort+'/store/login'; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js index b9af20857c9..3f058e0825a 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/RoleInstall.js @@ -35,9 +35,7 @@ class RoleInstall extends React.Component { 'api-endpoint': "/device-mgt/v1.0/roles?filter=" + value }; - const request = Object.keys(parameters).map(key => key + '=' + parameters[key]).join('&'); - console.log(request); - axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request + axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store, request ).then(res => { if (res.status === 200) { if (fetchId !== this.lastFetchId) { @@ -45,8 +43,6 @@ class RoleInstall extends React.Component { return; } - console.log(res.data.data); - const data = res.data.data.roles.map(role => ({ text: role, value: role, @@ -55,7 +51,7 @@ class RoleInstall extends React.Component { this.setState({data, fetching: false}); } - }).catch((error) => { + }).catch((error) => { console.log(error); if (error.hasOwnProperty("status") && error.response.status === 401) { message.error('You are not logged in'); window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort+'/store/login'; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js index 9730b70a071..57d87492424 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/install/UserInstall.js @@ -23,7 +23,6 @@ class UserInstall extends React.Component { }; fetchUser = value => { - console.log('fetching user', value); this.lastFetchId += 1; const fetchId = this.lastFetchId; this.setState({data: [], fetching: true}); @@ -31,7 +30,7 @@ class UserInstall extends React.Component { //send request to the invoker axios.get( - config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri+"/device-mgt/v1.0/users/search?username=" + value, + config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store+"/device-mgt/v1.0/users/search?username=" + value, { headers: { 'X-Platform': config.serverConfig.platform } } @@ -42,8 +41,6 @@ class UserInstall extends React.Component { return; } - console.log(res.data.data); - const data = res.data.data.users.map(user => ({ text: user.username, value: user.username, diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js index 41f2a1b067c..ea6368457e6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/AddReview.js @@ -54,8 +54,12 @@ class AddReview extends React.Component { const request = "method=post&content-type=application/json&payload="+JSON.stringify(payload)+"&api-endpoint=/application-mgt-store/v1.0/reviews/"+uuid; - axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request - ).then(res => { + axios.post( + config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+uuid, + payload, + { + headers: { 'X-Platform': config.serverConfig.platform } + }).then(res => { if (res.status === 201) { this.setState({ loading: false, diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js index dadce12a044..db2b69c52df 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/components/apps/release/review/Reviews.js @@ -27,9 +27,14 @@ class Reviews extends React.Component { } fetchData = (offset, limit, callback) => { - const request = "method=get&content-type=application/json&payload={}&api-endpoint=/application-mgt-store/v1.0/reviews/" + this.props.uuid + "?offset=" + offset + "%26limit=" + limit; - axios.post(config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request - ).then(res => { + + const {uuid, type} = this.props; + + axios.get( + config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri +config.serverConfig.invoker.store+"/reviews/"+type+"/"+uuid, + { + headers: {'X-Platform': config.serverConfig.platform} + }).then(res => { if (res.status === 200) { let reviews = res.data.data.data; callback(reviews); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js index 458adf8d942..2a2a1dd0ff4 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/Dashboard.js @@ -19,7 +19,6 @@ class Dashboard extends React.Component { } changeSelectedMenuItem = (key) =>{ - console.log("called", key); this.setState({ selectedKeys: [key] }) @@ -27,7 +26,6 @@ class Dashboard extends React.Component { render() { const {selectedKeys} = this.state; - console.log(selectedKeys); return (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/release/Release.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/release/Release.js index e317c8ef416..2882d19b155 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/release/Release.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/src/pages/dashboard/apps/release/Release.js @@ -28,7 +28,6 @@ class Release extends React.Component { } componentDidUpdate(prevProps, prevState, snapshot) { - console.log(prevState); if (prevState.uuid !== this.state.uuid) { const {uuid,deviceType} = this.props.match.params; this.fetchData(uuid); @@ -39,7 +38,7 @@ class Release extends React.Component { fetchData = (uuid)=>{ //send request to the invoker axios.get( - config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri+"/applications/"+uuid, + config.serverConfig.protocol + "://"+config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invoker.uri + config.serverConfig.invoker.store+"/applications/"+uuid, { headers: { 'X-Platform': config.serverConfig.platform } } @@ -47,8 +46,6 @@ class Release extends React.Component { if (res.status === 200) { let app = res.data.data; - console.log(app); - this.setState({ app: app, loading: false, @@ -56,7 +53,7 @@ class Release extends React.Component { }) } - }).catch((error) => { + }).catch((error) => { console.log(error); if (error.hasOwnProperty("response") && error.response.status === 401) { //todo display a popop with error message.error('You are not logged in');