Merge branch 'application-mgt-new' into 'application-mgt-new'

Fix device type loading issue for custom apps

See merge request entgra/carbon-device-mgt!248

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/public/conf/config.json

@@ -67,28 +67,7 @@
       "text": "The final state of an application, where no transition of states will be allowed after this."
     }
   },
-  "installationTypes": {
+  "deviceTypes": {
-    "ENTERPRISE": {
+    "mobileTypes": ["android", "ios"]
-      "deviceTypes": [
-        "android",
-        "ios"
-      ]
-    },
-    "PUBLIC": {
-      "deviceTypes": [
-        "android",
-        "ios"
-      ]
-    },
-    "WEB_CLIP": {
-      "deviceTypes": [
-        "android",
-        "ios"
-      ]
-    },
-    "CUSTOM": {
-      "deviceTypes": [
-      ]
-    }
   }
 }

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

@@ -414,6 +414,7 @@ class AppDetailsDrawer extends React.Component {
         }
     };
 
+
     render() {
         const config = this.props.context;
         const {app, visible, onClose} = this.props;
@@ -459,12 +460,11 @@ class AppDetailsDrawer extends React.Component {
             <div>
                 <Drawer
                     placement="right"
-                    width={this.state.drawerWidth}
+                    width={640}
                     closable={false}
                     onClose={onClose}
                     visible={visible}
                 >
-
                     <Spin spinning={loading} delay={500}>
                         <div style={{textAlign: "center"}}>
                             {avatar}
@@ -555,7 +555,6 @@ class AppDetailsDrawer extends React.Component {
                         )}
 
                         <Divider dashed={true}/>
-
                         <Text strong={true}>Categories </Text>
                         {!isCategoriesEditEnabled && (<Text
                                 style={{color: config.theme.primaryColor, cursor: "pointer"}}
@@ -600,8 +599,8 @@ class AppDetailsDrawer extends React.Component {
                             }</span>
                         )}
 
-                        <Divider dashed={true}/>
 
+                        <Divider dashed={true}/>
                         <Text strong={true}>Tags </Text>
                         {!isTagsEditEnabled && (<Text
                                 style={{color: config.theme.primaryColor, cursor: "pointer"}}

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js

@@ -148,21 +148,31 @@ class NewAppDetailsForm extends React.Component {
     getDeviceTypes = () => {
         const config = this.props.context;
         const {formConfig} = this.props;
-        console.log("test");
+        const {installationType} = formConfig;
-
 
         axios.get(
             window.location.origin + config.serverConfig.invoker.uri + config.serverConfig.invoker.deviceMgt + "/device-types"
         ).then(res => {
             if (res.status === 200) {
                 const allDeviceTypes = JSON.parse(res.data.data);
-                const whitelistedDeviceTypes = config.installationTypes[formConfig.installationType].deviceTypes;
+                const mobileDeviceTypes = config.deviceTypes.mobileTypes;
                 const allowedDeviceTypes = [];
-                allDeviceTypes.forEach(deviceType=>{
+
-                    if(whitelistedDeviceTypes.includes(deviceType.name)){
+                // exclude mobile device types if installation type is custom
-                        allowedDeviceTypes.push(deviceType);
+                if(installationType==="CUSTOM"){
-                    }
+                    allDeviceTypes.forEach(deviceType=>{
-                });
+                        if(!mobileDeviceTypes.includes(deviceType.name)){
+                            allowedDeviceTypes.push(deviceType);
+                        }
+                    });
+                }else{
+                    allDeviceTypes.forEach(deviceType=>{
+                        if(mobileDeviceTypes.includes(deviceType.name)){
+                            allowedDeviceTypes.push(deviceType);
+                        }
+                    });
+                }
+
                 this.setState({
                     deviceTypes: allowedDeviceTypes,
                     loading: false,