{getFieldDecorator('meta', {})(
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js
index 1fa47170e9..abaea5dbe9 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js
@@ -41,7 +41,10 @@ class AddNewReleaseFormComponent extends React.Component {
supportedOsVersions: [],
application: null,
release: null,
- deviceType: null
+ deviceType: null,
+ forbiddenErrors: {
+ supportedOsVersions: false
+ }
};
}
@@ -63,10 +66,19 @@ class AddNewReleaseFormComponent 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
+ });
+ }
});
};
@@ -85,7 +97,7 @@ class AddNewReleaseFormComponent extends React.Component {
data.append("applicationRelease", blob);
const url = window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher +
- "/applications/" + deviceType + "/ent-app/" + appId;
+ "/applications/" + deviceType + "/ent-app/" + appId;
axios.post(
url,
data
@@ -122,14 +134,15 @@ class AddNewReleaseFormComponent extends React.Component {
};
render() {
- const {loading, supportedOsVersions} = this.state;
+ const {loading, supportedOsVersions, forbiddenErrors} = this.state;
return (
-
+
{
+export const handleApiError = (error, message, isForbiddenMessageSilent) => {
if (error.hasOwnProperty("response") && error.response.status === 401) {
const redirectUrl = encodeURI(window.location.href);
window.location.href = window.location.origin + `/publisher/login?redirect=${redirectUrl}`;
- } else {
+ // silence 403 forbidden message
+ } else if(!(isForbiddenMessageSilent && error.hasOwnProperty("response") && error.response.status === 403)){
notification["error"]({
message: "There was a problem",
duration: 10,
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 40fd63a0ba..fc653d7bf4 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
@@ -24,6 +24,7 @@ import ReleaseView from "../../../../components/apps/release/ReleaseView";
import LifeCycle from "../../../../components/apps/release/lifeCycle/LifeCycle";
import {withConfigContext} from "../../../../context/ConfigContext";
import {handleApiError} from "../../../../js/Utils";
+import NewAppUploadForm from "../../../../components/new-app/subForms/NewAppUploadForm";
const {Title} = Typography;
@@ -40,13 +41,19 @@ class Release extends React.Component {
release: null,
currentLifecycleStatus: null,
lifecycle: null,
- supportedOsVersions:[]
+ supportedOsVersions: [],
+ forbiddenErrors: {
+ supportedOsVersions: false,
+ lifeCycle: false
+ }
};
}
componentDidMount() {
const {uuid} = this.props.match.params;
this.fetchData(uuid);
+ this.getLifecycle();
+
}
componentDidUpdate(prevProps, prevState, snapshot) {
@@ -86,10 +93,8 @@ class Release extends React.Component {
loading: false,
uuid: uuid
});
- if(config.deviceTypes.mobileTypes.includes(app.deviceType)){
+ if (config.deviceTypes.mobileTypes.includes(app.deviceType)) {
this.getSupportedOsVersions(app.deviceType);
- }else{
- this.getLifecycle();
}
}
@@ -111,8 +116,15 @@ class Release extends React.Component {
})
}
- }).catch(function (error) {
- handleApiError(error, "Error occurred while trying to load lifecycle configuration.");
+ }).catch((error) => {
+ handleApiError(error, "Error occurred while trying to load lifecycle configuration.", true);
+ if (error.hasOwnProperty("response") && error.response.status === 403) {
+ const {forbiddenErrors} = this.state;
+ forbiddenErrors.lifeCycle = true;
+ this.setState({
+ forbiddenErrors
+ })
+ }
});
};
@@ -125,21 +137,28 @@ class Release extends React.Component {
if (res.status === 200) {
let supportedOsVersions = JSON.parse(res.data.data);
this.setState({
- supportedOsVersions,
- loading: false,
+ supportedOsVersions
});
- this.getLifecycle();
}
}).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 {app, release, currentLifecycleStatus, lifecycle, loading} = this.state;
+ const {app, release, currentLifecycleStatus, lifecycle, loading, forbiddenErrors} = this.state;
if (release == null && loading === false) {
return (
@@ -159,12 +178,13 @@ class Release extends React.Component {
{(release !== null) && (
)
}