@@ -207,6 +238,7 @@ class Step1 extends Component {
value={this.state.name}
onChange={this.onTextFieldChange}
/>
+ {this.state.errors.name}
@@ -293,8 +329,7 @@ class Step1 extends Component {
Step1.prototypes = {
handleNext: PropTypes.func,
handlePrev: PropTypes.func,
- setData: PropTypes.func,
- removeData: PropTypes.func
+ setData: PropTypes.func
};
export default Step1;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step2.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step2.jsx
index 3143b2eb85..d6d627cee0 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step2.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step2.jsx
@@ -20,8 +20,9 @@ import PropTypes from 'prop-types';
import React, {Component} from 'react';
import AuthHandler from "../../../../api/authHandler";
import PlatformMgtApi from "../../../../api/platformMgtApi";
-import {Button, FormGroup, Input, Label, ModalFooter} from 'reactstrap';
+import {Button, FormFeedback, FormGroup, Input, Label, ModalFooter} from 'reactstrap';
import {FormattedMessage} from 'react-intl';
+import * as validator from '../../../../common/validator';
/**
* The first step of the application creation wizard.
@@ -43,11 +44,13 @@ class Step2 extends Component {
this.setStepData = this.setStepData.bind(this);
this.onCancelClick = this.onCancelClick.bind(this);
this.onBackClick = this.onBackClick.bind(this);
+ this.validate = this.validate.bind(this);
this.platforms = [];
this.state = {
+ errors: {},
store: 1,
platformSelectedIndex: 0,
- platform: "",
+ platform: {},
platforms: []
};
}
@@ -80,7 +83,7 @@ class Step2 extends Component {
platform = platforms[index];
tmpPlatforms.push(platform);
}
- this.setState({platforms: tmpPlatforms, platformSelectedIndex: 0, platform: tmpPlatforms[0].name})
+ this.setState({platforms: tmpPlatforms, platformSelectedIndex: 0})
}
/**
@@ -92,7 +95,14 @@ class Step2 extends Component {
store: store,
platform: platform[0]
};
- this.props.setStepData("platform", data);
+
+ const {errorCount, errors} = this.validate();
+
+ if (errorCount > 0) {
+ this.setState({errors: errors})
+ } else {
+ this.props.setStepData("platform", data);
+ }
}
onCancelClick() {
@@ -103,6 +113,17 @@ class Step2 extends Component {
this.props.handlePrev();
}
+ validate() {
+ const {store, platform} = this.state;
+ let errors = {};
+ let errorCount = 0;
+ if (!validator.validateEmptyObject(platform)) {
+ errorCount++;
+ errors.platform = "You must select an application platform!"
+ }
+ return {errorCount, errors};
+ }
+
/**
* Triggers when changing the Platform selection.
* */
@@ -149,6 +170,7 @@ class Step2 extends Component {
)
}) :
}
+
{this.state.errors.platform}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step3.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step3.jsx
index 61b14509d3..76384d2214 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step3.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step3.jsx
@@ -19,7 +19,8 @@
import PropTypes from 'prop-types';
import Dropzone from 'react-dropzone';
import React, {Component} from 'react';
-import {Button, FormGroup, Label, ModalFooter} from 'reactstrap';
+import * as validator from '../../../../common/validator';
+import {Button, FormFeedback, FormGroup, Label, ModalFooter} from 'reactstrap';
import AppImage from "../../../UIComponents/AppImage/AppImage";
import {FormattedMessage} from 'react-intl';
@@ -42,6 +43,7 @@ class Step3 extends Component {
super();
this.setStepData = this.setStepData.bind(this);
this.onBackClick = this.onBackClick.bind(this);
+ this.validate = this.validate.bind(this);
this.onCancelClick = this.onCancelClick.bind(this);
this.state = {
icon: [],
@@ -57,18 +59,6 @@ class Step3 extends Component {
this.setState(defaultData);
}
- /**
- * Handles Chip delete function.
- * Removes the tag from state.tags
- * */
- handleRequestDelete(event) {
- this.chipData = this.state.tags;
- console.log(event.target); //TODO: Remove Console log.
- const chipToDelete = this.chipData.map((chip) => chip.value).indexOf(event.target.value);
- this.chipData.splice(chipToDelete, 1);
- this.setState({tags: this.chipData});
- };
-
/**
* Creates an object with the current step data and persist in the parent.
* */
@@ -82,7 +72,14 @@ class Step3 extends Component {
screenshots: screenshots
};
- this.props.setStepData("screenshots", stepData);
+ const {errorCount, errors} = this.validate();
+
+ if (errorCount > 0) {
+ this.setState({errors: errors})
+ } else {
+ this.props.setStepData("screenshots", stepData);
+ }
+
};
onCancelClick() {
@@ -93,6 +90,28 @@ class Step3 extends Component {
this.props.handlePrev();
}
+ validate() {
+ const {icon, banner, screenshots} = this.state;
+ let errors = {}, errorCount = 0;
+
+ if (!validator.validateEmpty(icon)) {
+ errorCount++;
+ errors.icon = "You must upload an icon image!"
+ }
+
+ if (!validator.validateEmpty(banner)) {
+ errorCount++;
+ errors.banner = "You must upload a banner image!"
+ }
+
+ if (!validator.validateEmpty(screenshots)) {
+ errorCount++;
+ errors.screenshots = "You must upload at least one screenshot image!"
+ }
+
+ return {errorCount, errors};
+ }
+
/**
* Removed user uploaded banner.
* */
@@ -146,6 +165,7 @@ class Step3 extends Component {
: }