From 756324d883f90a94004993142ac291bcb5bed3fc Mon Sep 17 00:00:00 2001
From: Jayasanka <jayasanka.sack@gmail.com>
Date: Thu, 16 May 2019 14:16:36 +0530
Subject: [PATCH] Fix minor issue in publisher ui lifecycle

---
 .../src/components/apps/release/LifecycleModal.js   |  5 ++---
 .../react-app/src/js/actions/index.js               | 13 ++++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
index e19510bad61..26db61287c6 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/LifecycleModal.js
@@ -78,12 +78,11 @@ class ConnectedLifecycleModal extends React.Component {
                         footer={null}
                     >
                         <Title level={4}>{this.props.currentStatus} <Icon type="arrow-right" /> {nextState}</Title>
-                        <p>Reason:</p>
                         <form onSubmit={this.handleSubmit}>
                             <Form.Item>
-                                <label htmlFor="username">username</label>
+                                <label htmlFor="username">Reason</label>
 
-                                <Input placeholder="Basic usage"  ref={(input) => this.reason = input}/>
+                                <Input placeholder="Enter the reason"  ref={(input) => this.reason = input}/>
                             </Form.Item>
                             {/*<Form.Item>*/}
                             {/*<TextArea*/}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
index 5e70f0a49bc..5b3d7656200 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/js/actions/index.js
@@ -101,18 +101,25 @@ export const updateLifecycleState = (uuid, nextState, reason) => dispatch => {
     return axios.post('https://' + config.serverConfig.hostname + ':' + config.serverConfig.httpsPort + config.serverConfig.invokerUri, request
     ).then(res => {
         if (res.status === 200) {
-            let release = res.data.data;
-            dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: release});
+            if(res.data.data.hasOwnProperty("release")) {
+                let release = res.data.data;
+                dispatch({type: ActionTypes.UPDATE_LIFECYCLE_STATE, payload: release});
+            }else{
+                alert("error");
+                dispatch({
+                    type: ActionTypes.CLOSE_LIFECYCLE_MODAL
+                });
+            }
         }
 
     }).catch(function (error) {
         if (error.response.status === 401) {
             window.location.href = 'https://localhost:9443/publisher/login';
         } else if (error.response.status === 500) {
+            alert("error");
             dispatch({
                 type: ActionTypes.CLOSE_LIFECYCLE_MODAL
             });
-            alert("error");
         }
     });