diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json index be4c3bbe853..127a5e7eaea 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json @@ -22,6 +22,7 @@ "react-dom": "^16.8.4", "react-highlight-words": "^0.16.0", "react-infinite-scroller": "^1.2.4", + "react-quill": "^1.3.3", "react-router": "latest", "react-router-config": "^5.0.0", "react-router-dom": "latest", diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.css b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.css deleted file mode 100644 index 912a757ebae..00000000000 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifeCycle.css +++ /dev/null @@ -1,7 +0,0 @@ -.srd-diagram{ - height: 100%; - min-height: 300px; - background-color: #3c3c3c !important; - background-image: linear-gradient(0deg, transparent 24%, rgba(255, 255, 255, 0.05) 25%, rgba(255, 255, 255, 0.05) 26%, transparent 27%, transparent 74%, rgba(255, 255, 255, 0.05) 75%, rgba(255, 255, 255, 0.05) 76%, transparent 77%, transparent), linear-gradient(90deg, transparent 24%, rgba(255, 255, 255, 0.05) 25%, rgba(255, 255, 255, 0.05) 26%, transparent 27%, transparent 74%, rgba(255, 255, 255, 0.05) 75%, rgba(255, 255, 255, 0.05) 76%, transparent 77%, transparent); - background-size: 50px 50px; -} diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js index 5764b8ce9aa..31290b0a899 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js @@ -41,7 +41,7 @@ class ReleaseView extends React.Component { + + + + You are going to change the lifecycle state from,
+ {currentStatus}to {selectedStatus} +
+

+ +
+ + + ); + } + +} + +export default LifeCycle; \ No newline at end of file diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js index b4ace63734d..bc3726ba01e 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/review/Reviews.js @@ -42,7 +42,7 @@ class Reviews extends React.Component { }).catch(function (error) { if (error.response.status === 401) { - window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + '/store/login'; + window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + '/publisher/login'; } else { message.warning('Something went wrong'); 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 a9a18c6e4aa..3536a8e06b6 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 @@ -4,24 +4,10 @@ import {PageHeader, Typography, Row, Col, message, Card} from "antd"; import axios from 'axios'; import config from "../../../../../public/conf/config.json"; import ReleaseView from "../../../../components/apps/release/ReleaseView"; -import LifeCycle from "../../../../components/apps/release/LifeCycle"; +import LifeCycle from "../../../../components/apps/release/lifeCycle/LifeCycle"; const {Title} = Typography; -const routes = [ - { - path: 'index', - breadcrumbName: 'Publisher', - }, - { - path: 'first', - breadcrumbName: 'Dashboard', - }, - { - path: 'second', - breadcrumbName: 'Apps', - }, -]; class Release extends React.Component { @@ -33,7 +19,9 @@ class Release extends React.Component { this.state = { loading: true, app: null, - uuid: null + uuid: null, + release: null, + currentLifecycleStatus: null, } } @@ -48,6 +36,11 @@ class Release extends React.Component { this.fetchData(uuid); } } + changeCurrentLifecycleStatus = (status) =>{ + this.setState({ + currentLifecycleStatus: status + }); + }; fetchData = (uuid) => { @@ -59,19 +52,23 @@ class Release extends React.Component { } ).then(res => { if (res.status === 200) { - let app = res.data.data; + const app = res.data.data; + const release = (app !== null) ? app.applicationReleases[0] : null; + const currentLifecycleStatus = (release!==null) ? release.currentStatus : null; this.setState({ app: app, + release: release, + currentLifecycleStatus: currentLifecycleStatus, loading: false, uuid: uuid - }) + }); } }).catch((error) => { if (error.hasOwnProperty("response") && error.response.status === 401) { //todo display a popop with error message.error('You are not logged in'); - window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + '/store/login'; + window.location.href = config.serverConfig.protocol + "://" + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + '/publisher/login'; } else { message.error('Something went wrong... :('); } @@ -81,9 +78,9 @@ class Release extends React.Component { }; render() { - const {app} = this.state; + const {app, release, currentLifecycleStatus} = this.state; - if (app == null) { + if (release == null) { return (
No Apps Found @@ -98,12 +95,12 @@ class Release extends React.Component { - + - {/**/} +