-
+ Info:
Enabling this will create a release for the current Application.
To upload the Application, please visit to the Release management section of
Application Edit View.
-
+
{/*If toggle is true, the release form will be shown.*/}
-
+
@@ -121,7 +131,12 @@ class Step4 extends Component {
-
+
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/Base/ApplicationEditBaseLayout.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/Base/ApplicationEditBaseLayout.jsx
index f96a9c82745..1962659fbf0 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/Base/ApplicationEditBaseLayout.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/Base/ApplicationEditBaseLayout.jsx
@@ -19,7 +19,8 @@
import React, {Component} from 'react';
import './baseLayout.css';
import ReleaseManager from '../../Release/ReleaseMgtBase/ReleaseManager';
-import {Button, Col, Row} from "reactstrap";
+import {Col, Row} from "reactstrap";
+import GeneralInfo from "../GeneralInfo";
class ApplicationEdit extends Component {
@@ -57,14 +58,12 @@ class ApplicationEdit extends Component {
return "No Content";
}
}
-
}
getTabContent(tab) {
-
switch (tab) {
case 1: {
- return ("Step 1")
+ return
}
case 2: {
return
@@ -73,14 +72,12 @@ class ApplicationEdit extends Component {
return ("Step3")
}
}
-
}
render() {
console.log(this.state);
return (
-
Application Name
@@ -101,66 +98,19 @@ class ApplicationEdit extends Component {
-
-
-
- {/* Application edit content */}
-
- {this.getTabContent(this.state.activeTab)}
+
+
+
+ {/* Application edit content */}
+
+ {this.getTabContent(this.state.activeTab)}
+
-
-
-
-
-
-
-
-
+
+
-
- {/**/}
- {/*/!* Contains the application Name and Save button*!/*/}
- {/*
)
}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/Base/baseLayout.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/Base/baseLayout.css
index 5e6c1e9af3b..3ee209b3e53 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/Base/baseLayout.css
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/Base/baseLayout.css
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
#application-edit-base {
width: 70%;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/GeneralInfo.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/GeneralInfo.jsx
index d1cda615269..13c1b1a9ab6 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/GeneralInfo.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/GeneralInfo.jsx
@@ -18,26 +18,187 @@
import PropTypes from 'prop-types';
import React, {Component} from 'react';
-
+import {FormGroup, Input, Label, Badge, Button} from 'reactstrap';
+import Dropzone from 'react-dropzone';
+import './generalInfo.css';
class GeneralInfo extends Component {
constructor() {
super();
+ this.state = {
+ defValue: "",
+ tags: [],
+ screenshots: [],
+ icon: [],
+ banner: []
+ }
}
-
render() {
return(
-
+
+
)
-
-
}
-
-
}
export default GeneralInfo;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseContent.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/generalInfo.css
similarity index 85%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseContent.jsx
rename to components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/generalInfo.css
index 1d22a374454..fb0471eddc0 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseContent.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Edit/generalInfo.css
@@ -16,14 +16,11 @@
* under the License.
*/
-import React, {Component} from 'react';
-
-class ReleaseContent extends Component {
-
-
-
-
+.app-edit-general-info {
+ margin-top: 20px;
}
-
-export default ReleaseContent;
+.save-info {
+ float: right;
+ margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/CreateRelease.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/CreateRelease.jsx
new file mode 100644
index 00000000000..b737680c920
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/CreateRelease.jsx
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import PropTypes from 'prop-types';
+import React, {Component} from 'react';
+import './createRelease.css';
+import {Button, FormGroup, FormText, Input, Label, Row} from "reactstrap";
+import UploadPackage from "./UploadPackage";
+
+class CreateRelease extends Component {
+ constructor() {
+ super();
+ this.onTestMethodChange = this.onTestMethodChange.bind(this);
+ this.showUploadArtifacts = this.showUploadArtifacts.bind(this);
+ this.handleBack = this.handleBack.bind(this);
+ this.backToRelease = this.backToRelease.bind(this);
+ this.state = {
+ open: true,
+ hiddenMain: false
+ }
+ }
+
+ onTestMethodChange(event) {
+ let type = event.target.value;
+ if (type !== 'open') {
+ this.setState({open: false})
+ } else {
+ this.setState({open: true})
+ }
+ }
+
+ showUploadArtifacts() {
+ this.setState({hiddenMain: true})
+ }
+
+ handleBack() {
+ this.props.handleBack();
+ }
+
+ backToRelease() {
+ this.setState({hiddenMain: false});
+ }
+
+ render() {
+ const {channel} = this.props;
+ console.log(channel);
+ return (
+
+ {channel === 'Production' ? "" :
+ "You could create " + channel + " release for your application and let " +
+ "the test users to test the application for it's stability."}
+
+
+
+
+
+
+
+ {channel !== 'Production' ?
+
+
+
+ Manage Test Method
+
+
+ This section allows you to change the test method and the users who would be
+ able to test your application.
+
+
+
+
+
+ :
+
+ }
+
+ }
+
+
+ );
+ }
+}
+
+CreateRelease.propTypes = {
+ channel: PropTypes.string,
+ handleBack: PropTypes.func
+};
+
+export default CreateRelease;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx
new file mode 100644
index 00000000000..8eb017fa599
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import PropTypes from 'prop-types';
+import React, {Component} from 'react';
+import './createRelease.css';
+import {Button, Col, FormGroup, Input, Label, Row} from "reactstrap";
+
+class UploadPackage extends Component {
+
+ constructor() {
+ super();
+ this.handleBack = this.handleBack.bind(this)
+ }
+
+ handleBack() {
+ this.props.backToRelease();
+ }
+
+ render() {
+ const {selectedChannel} = this.props;
+ return (
+
+
+
+ {"<-"}
+
+ New Release for {selectedChannel}
+
+
+
+
+
+
+ Upload Package File
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+}
+
+UploadPackage.protoTypes = {
+ backToRelease: PropTypes.func,
+ channel: PropTypes.string
+};
+
+export default UploadPackage;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/createRelease.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/createRelease.css
new file mode 100644
index 00000000000..1cd66945976
--- /dev/null
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/createRelease.css
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.release-header {
+ margin-top: 20px;
+ margin-bottom: 20px;
+}
+
+.release-create {
+ height: 150px;
+ margin-bottom: 20px;
+}
+
+.release-detail-content {
+ width: 100%;
+ margin-top: 20%;
+ height: 300px;
+}
+
+.form-btn {
+ float: right;
+ margin-bottom: 10px;
+}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseMgtBase/ReleaseManager.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseMgtBase/ReleaseManager.jsx
index a580d75edb5..0501f6b2d60 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseMgtBase/ReleaseManager.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseMgtBase/ReleaseManager.jsx
@@ -16,15 +16,32 @@
* under the License.
*/
+import PropTypes from 'prop-types';
import React, {Component} from 'react';
import './release-mgt.css';
import {Button, Col, Row} from "reactstrap";
+import CreateRelease from "../Create/CreateRelease";
class ReleaseManager extends Component {
constructor() {
super();
this.getNoReleaseContent = this.getNoReleaseContent.bind(this);
+ this.createRelease = this.createRelease.bind(this);
+ this.handleBackPress = this.handleBackPress.bind(this);
+ this.state = {
+ createRelease: false,
+ onGoing: ""
+ }
+ }
+
+ createRelease(event) {
+ event.preventDefault();
+ this.setState({createRelease: true, onGoing: event.target.value})
+ }
+
+ handleBackPress() {
+ this.setState({createRelease: false});
}
/**
@@ -40,7 +57,14 @@ class ReleaseManager extends Component {
)
}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseMgtBase/release-mgt.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseMgtBase/release-mgt.css
index d72a8ea81c9..7fd6831f245 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseMgtBase/release-mgt.css
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/ReleaseMgtBase/release-mgt.css
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
.release-content {
height: 180px;
width: 95%;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.css
index c5776f73188..32f3c298a8e 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.css
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.css
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
body {
width: 100%;
font-family: sans-serif;
@@ -32,6 +50,14 @@ body {
width: 100%;
background-color: #BDBDBD;
border-bottom: solid 2px;
+ position: fixed; /* Set the navbar to fixed position */
+ top: 0; /* Position the navbar at the top of the page */
+ z-index: 2;
+}
+
+#application-content {
+ max-height: 800px;
+ margin-top: 150px;
}
#add-btn {
@@ -187,3 +213,5 @@ body {
color: #818181;
}
+
+