Validate supported OS versions in 'Add new app' form in APPM Publisher UI

4.x.x
Jayasanka 5 years ago
parent 5153feae40
commit 3c9d200770

@ -13,7 +13,7 @@
"@ant-design/dark-theme": "^0.2.2", "@ant-design/dark-theme": "^0.2.2",
"@babel/polyfill": "^7.6.0", "@babel/polyfill": "^7.6.0",
"acorn": "^6.2.0", "acorn": "^6.2.0",
"antd": "^3.22.2", "antd": "^3.23.6",
"axios": "^0.19.0", "axios": "^0.19.0",
"d3": "^5.9.7", "d3": "^5.9.7",
"dagre": "^0.8.4", "dagre": "^0.8.4",

@ -61,6 +61,8 @@ class NewAppUploadForm extends React.Component {
binaryFileHelperText: '', binaryFileHelperText: '',
iconHelperText: '', iconHelperText: '',
screenshotHelperText: '', screenshotHelperText: '',
osVersionsHelperText: '',
osVersionsValidateStatus: 'validating',
metaData: [] metaData: []
}; };
this.lowerOsVersion = null; this.lowerOsVersion = null;
@ -95,10 +97,6 @@ class NewAppUploadForm extends React.Component {
releaseType: releaseType releaseType: releaseType
}; };
if (formConfig.installationType !== "WEB_CLIP" && formConfig.installationType !== "CUSTOM") {
release.supportedOsVersions = `${this.lowerOsVersion}-${this.upperOsVersion}`;
}
if (specificElements.hasOwnProperty("version")) { if (specificElements.hasOwnProperty("version")) {
release.version = values.version; release.version = values.version;
} }
@ -110,20 +108,51 @@ class NewAppUploadForm extends React.Component {
} }
const data = new FormData(); const data = new FormData();
let isFormValid = true; // flag to check if this form is valid
if (formConfig.installationType !== "WEB_CLIP" && formConfig.installationType !== "CUSTOM") {
if(this.lowerOsVersion==null || this.upperOsVersion==null){
isFormValid = false;
this.setState({
osVersionsHelperText: 'Please select supported OS versions',
osVersionsValidateStatus: 'error',
});
}else if(this.lowerOsVersion>=this.upperOsVersion){
isFormValid = false;
this.setState({
osVersionsHelperText: 'Please select valid range',
osVersionsValidateStatus: 'error',
});
}else{
release.supportedOsVersions = `${this.lowerOsVersion}-${this.upperOsVersion}`;
}
}
if (specificElements.hasOwnProperty("binaryFile") && this.state.binaryFiles.length !== 1) { if (specificElements.hasOwnProperty("binaryFile") && this.state.binaryFiles.length !== 1) {
isFormValid = false;
this.setState({ this.setState({
binaryFileHelperText: 'Please select the application' binaryFileHelperText: 'Please select the application'
}); });
} else if (this.state.icons.length !== 1) { }
if (this.state.icons.length !== 1) {
isFormValid = false;
this.setState({ this.setState({
iconHelperText: 'Please select an icon' iconHelperText: 'Please select an icon'
}); });
} else if (this.state.screenshots.length !== 3) { }
if (this.state.screenshots.length !== 3) {
isFormValid = false;
this.setState({ this.setState({
screenshotHelperText: 'Please select 3 screenshots' screenshotHelperText: 'Please select 3 screenshots'
}); });
} else { }
if (this.state.screenshots.length !== 3) {
isFormValid = false;
this.setState({
screenshotHelperText: 'Please select 3 screenshots'
});
}
if(isFormValid) {
data.append('icon', icon[0].originFileObj); data.append('icon', icon[0].originFileObj);
data.append('screenshot1', screenshots[0].originFileObj); data.append('screenshot1', screenshots[0].originFileObj);
data.append('screenshot2', screenshots[1].originFileObj); data.append('screenshot2', screenshots[1].originFileObj);
@ -193,10 +222,18 @@ class NewAppUploadForm extends React.Component {
handleLowerOsVersionChange = (lowerOsVersion) => { handleLowerOsVersionChange = (lowerOsVersion) => {
this.lowerOsVersion = lowerOsVersion; this.lowerOsVersion = lowerOsVersion;
this.setState({
osVersionsValidateStatus: 'validating',
osVersionsHelperText: ''
});
}; };
handleUpperOsVersionChange = (upperOsVersion) => { handleUpperOsVersionChange = (upperOsVersion) => {
this.upperOsVersion = upperOsVersion; this.upperOsVersion = upperOsVersion;
this.setState({
osVersionsValidateStatus: 'validating',
osVersionsHelperText: ''
});
}; };
render() { render() {
@ -212,7 +249,9 @@ class NewAppUploadForm extends React.Component {
binaryFileHelperText, binaryFileHelperText,
iconHelperText, iconHelperText,
screenshotHelperText, screenshotHelperText,
metaData metaData,
osVersionsHelperText,
osVersionsValidateStatus
} = this.state; } = this.state;
const uploadButton = ( const uploadButton = (
<div> <div>
@ -361,7 +400,11 @@ class NewAppUploadForm extends React.Component {
</Form.Item> </Form.Item>
{(formConfig.installationType !== "WEB_CLIP" && formConfig.installationType !== "CUSTOM") && ( {(formConfig.installationType !== "WEB_CLIP" && formConfig.installationType !== "CUSTOM") && (
<Form.Item {...formItemLayout} label="Supported OS Versions"> <Form.Item
{...formItemLayout}
label="Supported OS Versions"
validateStatus={osVersionsValidateStatus}
help={osVersionsHelperText}>
{getFieldDecorator('supportedOS')( {getFieldDecorator('supportedOS')(
<div> <div>
<InputGroup> <InputGroup>
@ -436,7 +479,6 @@ class NewAppUploadForm extends React.Component {
required: true, required: true,
message: 'Please select' message: 'Please select'
}], }],
initialValue: false
})( })(
<Switch checkedChildren={<Icon type="check"/>} <Switch checkedChildren={<Icon type="check"/>}
unCheckedChildren={<Icon type="close"/>} unCheckedChildren={<Icon type="close"/>}
@ -444,13 +486,7 @@ class NewAppUploadForm extends React.Component {
)} )}
</Form.Item> </Form.Item>
<Form.Item {...formItemLayout} label="Meta Data"> <Form.Item {...formItemLayout} label="Meta Data">
{getFieldDecorator('meta', { {getFieldDecorator('meta', {})(
rules: [{
required: true,
message: 'Please fill empty fields'
}],
initialValue: false
})(
<div> <div>
{ {
metaData.map((data, index) => { metaData.map((data, index) => {

Loading…
Cancel
Save