-
- (
-
-
-
- )}
- >
- {this.state.loading && this.state.hasMore && (
-
-
-
- )}
-
-
- {!this.state.loadMore && (this.state.data.length >= limit) && (
-
-
)}
+
+ {(this.state.forbiddenErrors.reviews) && (
+
+ )}
+
+
+ (
+
+
+
+ )}>
+ {this.state.loading && this.state.hasMore && (
+
+
+
+ )}
+
+
+ {!this.state.loadMore && (this.state.data.length >= limit) && (
+
+
)}
+
);
}
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 984cd5d67d5..a4de1592636 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
@@ -32,7 +32,7 @@ import {
Modal,
Row,
Col,
- Typography
+ Typography, Alert
} from "antd";
import axios from "axios";
import {TweenOneGroup} from 'rc-tween-one';
@@ -53,13 +53,16 @@ class ManageCategories extends React.Component {
isAddNewVisible: false,
isEditModalVisible: false,
currentlyEditingId: null,
- editingValue: null
+ editingValue: null,
+ forbiddenErrors: {
+ categories: false
+ }
};
componentDidMount() {
const config = this.props.context;
axios.get(
- window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/categories",
+ window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/categories",
).then(res => {
if (res.status === 200) {
let categories = JSON.parse(res.data.data);
@@ -70,10 +73,19 @@ class ManageCategories extends React.Component {
}
}).catch((error) => {
- handleApiError(error, "Error occured while trying to load categories");
- this.setState({
- loading: false
- });
+ handleApiError(error, "Error occured while trying to load categories", true);
+ if (error.hasOwnProperty("response") && error.response.status === 403) {
+ const {forbiddenErrors} = this.state;
+ forbiddenErrors.categories = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false
+ })
+ } else {
+ this.setState({
+ loading: false
+ });
+ }
});
}
@@ -90,7 +102,7 @@ class ManageCategories extends React.Component {
loading: true
});
axios.delete(
- window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/admin/applications/categories/" + id,
+ window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/admin/applications/categories/" + id,
).then(res => {
if (res.status === 200) {
notification["success"]({
@@ -125,8 +137,7 @@ class ManageCategories extends React.Component {
const tagElem = (
+ style={{marginTop: 8}}>
{categoryName}
@@ -150,8 +161,7 @@ class ManageCategories extends React.Component {
}
}}
okText="Yes"
- cancelText="No"
- >
+ cancelText="No">
@@ -168,7 +178,7 @@ class ManageCategories extends React.Component {
const config = this.props.context;
const tagElem = (
{
e.preventDefault();
@@ -229,7 +239,7 @@ class ManageCategories extends React.Component {
const data = tempElements.map(category => category.categoryName);
axios.post(
- window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/admin/applications/categories",
+ window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/admin/applications/categories",
data,
).then(res => {
if (res.status === 200) {
@@ -287,7 +297,7 @@ class ManageCategories extends React.Component {
});
axios.put(
- window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/admin/applications/categories/rename?from=" + currentlyEditingId + "&to=" + editingValue,
+ window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/admin/applications/categories/rename?from=" + currentlyEditingId + "&to=" + editingValue,
{},
).then(res => {
if (res.status === 200) {
@@ -324,11 +334,18 @@ class ManageCategories extends React.Component {
};
render() {
- const {categories, inputVisible, inputValue, tempElements, isAddNewVisible} = this.state;
+ const {categories, inputVisible, inputValue, tempElements, isAddNewVisible, forbiddenErrors} = this.state;
const categoriesElements = categories.map(this.renderElement);
const temporaryElements = tempElements.map(this.renderTempElement);
return (
+ {(forbiddenErrors.categories) && (
+
+ )}
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 69c269bc173..8b9ed800b17 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
@@ -31,7 +31,7 @@ import {
Popconfirm,
Modal,
Row, Col,
- Typography
+ Typography, Alert
} from "antd";
import axios from "axios";
import {TweenOneGroup} from 'rc-tween-one';
@@ -51,13 +51,16 @@ class ManageTags extends React.Component {
isAddNewVisible: false,
isEditModalVisible: false,
currentlyEditingId: null,
- editingValue: null
+ editingValue: null,
+ forbiddenErrors: {
+ tags: false
+ }
};
componentDidMount() {
const config = this.props.context;
axios.get(
- window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags",
+ window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags",
).then(res => {
if (res.status === 200) {
let tags = JSON.parse(res.data.data);
@@ -68,10 +71,19 @@ class ManageTags extends React.Component {
}
}).catch((error) => {
- handleApiError(error, "Error occurred while trying to load tags.");
- this.setState({
- loading: false
- });
+ handleApiError(error, "Error occurred while trying to load tags.", true);
+ if (error.hasOwnProperty("response") && error.response.status === 403) {
+ const {forbiddenErrors} = this.state;
+ forbiddenErrors.tags = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false
+ })
+ } else {
+ this.setState({
+ loading: false
+ });
+ }
});
}
@@ -90,7 +102,7 @@ class ManageTags extends React.Component {
});
axios.delete(
- window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/admin/applications/tags/" + id
+ window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/admin/applications/tags/" + id
).then(res => {
if (res.status === 200) {
notification["success"]({
@@ -124,7 +136,7 @@ class ManageTags extends React.Component {
const tagElem = (
{tagName}
@@ -167,7 +179,7 @@ class ManageTags extends React.Component {
const {tempElements} = this.state;
const tagElem = (
{
e.preventDefault();
@@ -226,7 +238,7 @@ class ManageTags extends React.Component {
const data = tempElements.map(tag => tag.tagName);
- axios.post(window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags",
+ axios.post(window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags",
data,
).then(res => {
if (res.status === 200) {
@@ -284,7 +296,7 @@ class ManageTags extends React.Component {
});
axios.put(
- window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags/rename?from=" + currentlyEditingId + "&to=" + editingValue,
+ window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/tags/rename?from=" + currentlyEditingId + "&to=" + editingValue,
{},
).then(res => {
if (res.status === 200) {
@@ -321,11 +333,18 @@ class ManageTags extends React.Component {
};
render() {
- const {tags, inputVisible, inputValue, tempElements, isAddNewVisible} = this.state;
+ const {tags, inputVisible, inputValue, tempElements, isAddNewVisible, forbiddenErrors} = this.state;
const tagsElements = tags.map(this.renderElement);
const temporaryElements = tempElements.map(this.renderTempElement);
return (
+ {(forbiddenErrors.tags) && (
+
+ )}
@@ -365,8 +384,7 @@ class ManageTags extends React.Component {
},
}}
leave={{opacity: 0, width: 0, scale: 0, duration: 200}}
- appear={false}
- >
+ appear={false}>
{temporaryElements}
{inputVisible && (
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js
index 340d28aa93f..39dc99ddb11 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/AddNewAppForm.js
@@ -55,7 +55,10 @@ class AddNewAppFormComponent extends React.Component {
isError: false,
deviceType: null,
supportedOsVersions: [],
- errorText: ""
+ errorText: "",
+ forbiddenErrors: {
+ supportedOsVersions: false
+ }
};
}
@@ -143,15 +146,24 @@ class AddNewAppFormComponent extends React.Component {
});
}
}).catch((error) => {
- handleApiError(error, "Error occurred while trying to load supported OS versions.");
- this.setState({
- loading: false
- });
+ handleApiError(error, "Error occurred while trying to load supported OS versions.", true);
+ if (error.hasOwnProperty("response") && error.response.status === 403) {
+ const {forbiddenErrors} = this.state;
+ forbiddenErrors.supportedOsVersions = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false
+ })
+ } else {
+ this.setState({
+ loading: false
+ });
+ }
});
};
render() {
- const {loading, current, isError, supportedOsVersions, errorText} = this.state;
+ const {loading, current, isError, supportedOsVersions, errorText, forbiddenErrors} = this.state;
const {formConfig} = this.props;
return (
@@ -171,6 +183,7 @@ class AddNewAppFormComponent extends React.Component {
{
e.preventDefault();
const {formConfig} = this.props;
@@ -58,13 +68,17 @@ class NewAppDetailsForm extends React.Component {
this.setState({
loading: true
});
- const {name, description, categories, tags, price, isSharedWithAllTenants, binaryFile, icon, screenshots, releaseDescription, releaseType} = values;
+ const {name, description, categories, tags, unrestrictedRoles} = values;
+ const unrestrictedRolesData = [];
+ unrestrictedRoles.map(val => {
+ unrestrictedRolesData.push(val.key);
+ });
const application = {
name,
description,
categories,
tags,
- unrestrictedRoles: [],
+ unrestrictedRoles: unrestrictedRolesData,
};
if (formConfig.installationType !== "WEB_CLIP") {
@@ -81,6 +95,8 @@ class NewAppDetailsForm extends React.Component {
componentDidMount() {
this.getCategories();
+ this.getTags();
+ this.getDeviceTypes();
}
getCategories = () => {
@@ -95,13 +111,20 @@ class NewAppDetailsForm extends React.Component {
loading: false
});
}
- this.getTags();
-
}).catch((error) => {
- handleApiError(error, "Error occurred while trying to load categories.");
- this.setState({
- loading: false
- });
+ handleApiError(error, "Error occurred while trying to load categories.", true);
+ if (error.hasOwnProperty("response") && error.response.status === 403) {
+ const {forbiddenErrors} = this.state;
+ forbiddenErrors.categories = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false
+ })
+ } else {
+ this.setState({
+ loading: false
+ });
+ }
});
};
@@ -117,13 +140,20 @@ class NewAppDetailsForm extends React.Component {
loading: false,
});
}
- this.getDeviceTypes();
-
}).catch((error) => {
- handleApiError(error, "Error occurred while trying to load tags.");
- this.setState({
- loading: false
- });
+ handleApiError(error, "Error occurred while trying to load tags.", true);
+ if (error.hasOwnProperty("response") && error.response.status === 403) {
+ const {forbiddenErrors} = this.state;
+ forbiddenErrors.tags = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false
+ })
+ } else {
+ this.setState({
+ loading: false
+ });
+ }
});
};
@@ -141,15 +171,15 @@ class NewAppDetailsForm extends React.Component {
const allowedDeviceTypes = [];
// exclude mobile device types if installation type is custom
- if(installationType==="CUSTOM"){
- allDeviceTypes.forEach(deviceType=>{
- if(!mobileDeviceTypes.includes(deviceType.name)){
+ if (installationType === "CUSTOM") {
+ allDeviceTypes.forEach(deviceType => {
+ if (!mobileDeviceTypes.includes(deviceType.name)) {
allowedDeviceTypes.push(deviceType);
}
});
- }else{
- allDeviceTypes.forEach(deviceType=>{
- if(mobileDeviceTypes.includes(deviceType.name)){
+ } else {
+ allDeviceTypes.forEach(deviceType => {
+ if (mobileDeviceTypes.includes(deviceType.name)) {
allowedDeviceTypes.push(deviceType);
}
});
@@ -161,16 +191,76 @@ class NewAppDetailsForm extends React.Component {
});
}
}).catch((error) => {
- handleApiError(error, "Error occurred while trying to load device types.");
- this.setState({
- loading: false
- });
+ handleApiError(error, "Error occurred while trying to load device types.", true);
+ if (error.hasOwnProperty("response") && error.response.status === 403) {
+ const {forbiddenErrors} = this.state;
+ forbiddenErrors.deviceTypes = true;
+ this.setState({
+ forbiddenErrors,
+ loading: false
+ })
+ } else {
+ this.setState({
+ loading: false
+ });
+ }
+ });
+ };
+
+ fetchRoles = value => {
+ const config = this.props.context;
+ this.lastFetchId += 1;
+ const fetchId = this.lastFetchId;
+ this.setState({data: [], fetching: true});
+
+ axios.get(
+ window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt + "/roles?filter=" + value,
+ ).then(res => {
+ if (res.status === 200) {
+ if (fetchId !== this.lastFetchId) {
+ // for fetch callback order
+ return;
+ }
+
+ const data = res.data.data.roles.map(role => ({
+ text: role,
+ value: role,
+ }));
+
+ this.setState({
+ unrestrictedRoles: data,
+ fetching: false
+ });
+ }
+
+ }).catch((error) => {
+ handleApiError(error, "Error occurred while trying to load roles.", true);
+ if (error.hasOwnProperty("response") && error.response.status === 403) {
+ const {forbiddenErrors} = this.state;
+ forbiddenErrors.roles = true;
+ this.setState({
+ forbiddenErrors,
+ fetching: false
+ })
+ } else {
+ this.setState({
+ fetching: false
+ });
+ }
+ });
+ };
+
+ handleRoleSearch = roleSearchValue => {
+ this.setState({
+ roleSearchValue,
+ unrestrictedRoles: [],
+ fetching: false,
});
};
render() {
const {formConfig} = this.props;
- const {categories, tags, deviceTypes} = this.state;
+ const {categories, tags, deviceTypes, fetching, roleSearchValue, unrestrictedRoles, forbiddenErrors} = this.state;
const {getFieldDecorator} = this.props.form;
return (
@@ -185,34 +275,41 @@ class NewAppDetailsForm extends React.Component {
layout="horizontal"
onSubmit={this.handleSubmit}>
{formConfig.installationType !== "WEB_CLIP" && (
-
- {getFieldDecorator('deviceType', {
- rules: [
+
+ {(forbiddenErrors.deviceTypes) && (
+
+ )}
+
+ {getFieldDecorator('deviceType', {
+ rules: [
+ {
+ required: true,
+ message: 'Please select device type'
+ }
+ ],
+ }
+ )(
+
+
+ )}
+
+