community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add supported OS versions to add new release form in APPM UI

Browse Source
This commit is contained in:
Jayasanka 2019-10-07 15:01:05 +05:30
parent 407cbc6ef4
commit f1f7a3d9e3
2 changed files with 63 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js vendored
View File

@ -490,7 +490,7 @@ class AppDetailsDrawer extends React.Component {
<div className="releases-details"> <div className="releases-details">
{(app.type === "ENTERPRISE") && ( {(app.type === "ENTERPRISE") && (
<Link to={`/publisher/apps/${app.id}/add-release`}><Button htmlType="button" <Link to={`/publisher/apps/${app.deviceType}/${app.id}/add-release`}><Button htmlType="button"
size="small">Add size="small">Add
new release</Button></Link>)} new release</Button></Link>)}
<List <List

77
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-release/AddReleaseForm.js vendored
View File

@ -66,25 +66,26 @@ class AddNewReleaseFormComponent extends React.Component {
isFree: true, isFree: true,
supportedOsVersions: [] supportedOsVersions: []
}; };
this.lowerOsVersion = null;
this.upperOsVersion = null;
} }
componentDidMount() { componentDidMount() {
this.getSupportedOsVersions(); this.getSupportedOsVersions(this.props.deviceType);
} }
getSupportedOsVersions = () => { getSupportedOsVersions = (deviceType) => {
const config = this.props.context; const config = this.props.context;
axios.get( axios.get(
window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt +
"/admin/device-types/{deviceTypeName}/versions" `/admin/device-types/${deviceType}/versions`
).then(res => { ).then(res => {
if (res.status === 200) { if (res.status === 200) {
let supportedOsVersions = JSON.parse(res.data.data);
// let tags = JSON.parse(res.data.data); this.setState({
// this.setState({ supportedOsVersions,
// tags: tags, loading: false,
// loading: false, });
// });
} }
}).catch((error) => { }).catch((error) => {
handleApiError(error, "Error occurred while trying to load supported OS versions."); handleApiError(error, "Error occurred while trying to load supported OS versions.");
@ -116,9 +117,8 @@ class AddNewReleaseFormComponent extends React.Component {
isSharedWithAllTenants, isSharedWithAllTenants,
metaData: "string", metaData: "string",
releaseType: releaseType, releaseType: releaseType,
supportedOsVersions: "4-30" supportedOsVersions: `${this.lowerOsVersion}-${this.upperOsVersion}`
}; };
data.append('binaryFile', binaryFile[0].originFileObj); data.append('binaryFile', binaryFile[0].originFileObj);
data.append('icon', icon[0].originFileObj); data.append('icon', icon[0].originFileObj);
data.append('screenshot1', screenshots[0].originFileObj); data.append('screenshot1', screenshots[0].originFileObj);
@ -132,7 +132,7 @@ class AddNewReleaseFormComponent extends React.Component {
data.append("applicationRelease", blob); data.append("applicationRelease", blob);
const url = window.location.origin+ config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/"+deviceType+"/ent-app/" + appId; const url = window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + deviceType + "/ent-app/" + appId;
axios.post( axios.post(
url, url,
@ -151,7 +151,7 @@ class AddNewReleaseFormComponent extends React.Component {
const uuid = res.data.data.uuid; const uuid = res.data.data.uuid;
this.props.history.push('/publisher/apps/releases/'+uuid); this.props.history.push('/publisher/apps/releases/' + uuid);
} }
}).catch((error) => { }).catch((error) => {
@ -182,8 +182,16 @@ class AddNewReleaseFormComponent extends React.Component {
}); });
}; };
handleLowerOsVersionChange = (lowerOsVersion) => {
this.lowerOsVersion = lowerOsVersion;
};
handleUpperOsVersionChange = (upperOsVersion) => {
this.upperOsVersion = upperOsVersion;
};
render() { render() {
const {isFree, icons, screenshots, loading, binaryFiles} = this.state; const {isFree, icons, screenshots, loading, binaryFiles, supportedOsVersions} = this.state;
const {getFieldDecorator} = this.props.form; const {getFieldDecorator} = this.props.form;
return ( return (
<div> <div>
@ -291,6 +299,45 @@ class AddNewReleaseFormComponent extends React.Component {
)} )}
</Form.Item> </Form.Item>
<Form.Item {...formItemLayout} label="Supported OS Versions">
{getFieldDecorator('supportedOS')(
<div>
<InputGroup>
<Row gutter={8}>
<Col span={11}>
<Select
placeholder="Lower version"
style={{width: "100%"}}
onChange={this.handleLowerOsVersionChange}>
{supportedOsVersions.map(version => (
<Option key={version.versionName}
value={version.versionName}>
{version.versionName}
</Option>
))}
</Select>
</Col>
<Col span={2}>
<p> - </p>
</Col>
<Col span={11}>
<Select style={{width: "100%"}}
placeholder="Upper version"
onChange={this.handleUpperOsVersionChange}>
{supportedOsVersions.map(version => (
<Option key={version.versionName}
value={version.versionName}>
{version.versionName}
</Option>
))}
</Select>
</Col>
</Row>
</InputGroup>
</div>
)}
</Form.Item>
<Form.Item {...formItemLayout} label="Price Type"> <Form.Item {...formItemLayout} label="Price Type">
{getFieldDecorator('select', { {getFieldDecorator('select', {
rules: [{required: true, message: 'Please select price Type'}], rules: [{required: true, message: 'Please select price Type'}],