From f4e3c75c0b097731b083544d70f8ef3cc4749c71 Mon Sep 17 00:00:00 2001
From: Jayasanka Weerasinghe <jayasanka.sack@gmail.com>
Date: Thu, 31 Oct 2019 06:46:58 +0000
Subject: [PATCH] Remove managed configuration option from non android ent.
 apps in APPM UI

---
 .../AppDetailsDrawer/AppDetailsDrawer.js      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
index 7eaea07d32..c6ce74dc6c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
@@ -185,15 +185,16 @@ class AppDetailsDrawer extends React.Component {
                 window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.publisher + "/applications/" + id,
                 data
             ).then(res => {
-                this.props.onUpdateApp("name", name);
                 if (res.status === 200) {
+                    const app = res.data.data;
+                    this.props.onUpdateApp("name", app.name);
                     notification["success"]({
                         message: 'Saved!',
                         description: 'App name updated successfully!'
                     });
                     this.setState({
                         loading: false,
-                        name: name,
+                        name: app.name,
                     });
 
                 }
@@ -268,6 +269,7 @@ class AppDetailsDrawer extends React.Component {
                 data
             ).then(res => {
                 if (res.status === 200) {
+                    const app = res.data.data;
                     this.props.onUpdateApp("categories", temporaryCategories);
                     notification["success"]({
                         message: 'Saved!',
@@ -275,7 +277,7 @@ class AppDetailsDrawer extends React.Component {
                     });
                     this.setState({
                         loading: false,
-                        categories: temporaryCategories,
+                        categories: app.categories,
                         isCategoriesEditEnabled: false
                     });
 
@@ -334,13 +336,14 @@ class AppDetailsDrawer extends React.Component {
                 data
             ).then(res => {
                 if (res.status === 200) {
+                    const app = res.data.data;
                     notification["success"]({
                         message: 'Saved!',
                         description: 'App tags updated successfully!'
                     });
                     this.setState({
                         loading: false,
-                        tags: temporaryTags,
+                        tags: app.tags,
                         isTagsEditEnabled: false
                     });
                 }
@@ -375,13 +378,14 @@ class AppDetailsDrawer extends React.Component {
                 data
             ).then(res => {
                 if (res.status === 200) {
+                    const app = res.data.data;
                     notification["success"]({
                         message: 'Saved!',
                         description: 'App description updated successfully!'
                     });
                     this.setState({
                         loading: false,
-                        description: temporaryDescription,
+                        description: app.description,
                         isDescriptionEditEnabled: false
                     });
                 }
@@ -449,18 +453,15 @@ class AppDetailsDrawer extends React.Component {
                     width={this.state.drawerWidth}
                     closable={false}
                     onClose={onClose}
-                    visible={visible}
-                >
+                    visible={visible}>
                     <Spin spinning={loading} delay={500}>
                         <div style={{textAlign: "center"}}>
                             {avatar}
                             <Title editable={{onChange: this.handleNameSave}} level={2}>{name}</Title>
                         </div>
-
                         <Divider/>
-
                         {/*display manage config button only if the app is public android app*/}
-                        {(app.type === "PUBLIC") && (app.deviceType === "android") &&
+                        {(app.isAndroidEnterpriseApp) &&
                         (config.androidEnterpriseToken !== null) &&
                         (
                             <div>