From 91617a6dbb65b9a90f69e4ea046c3c25aa43e8ae Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saadsahibjan@gmail.com>
Date: Thu, 29 Aug 2019 13:22:04 +0530
Subject: [PATCH] Modify enrollment app install policy to support new app
 manager

---
 .../devicemgt/app/conf/config.json            |  2 +-
 .../modules/business-controllers/policy.js    | 20 +++++++++----------
 .../public/js/policy-create.js                |  2 +-
 .../public/js/policy-edit.js                  |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index a87877d6dc..60757b8461 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -166,6 +166,6 @@
   "isOAuthEnabled": true,
   "backendRestEndpoints": {
     "deviceMgt": "/api/device-mgt/v1.0",
-    "appMgt": "/api/appm/store/v1.1"
+    "appMgt": "/api/application-mgt-store/v1.0"
   }
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
index 1c84db0261..37dc9685b2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
@@ -67,7 +67,6 @@ policyModule = function () {
                 } else {
                     policyObjectToView["deviceTypeIcon"] = policyObjectToView["platform"];
                 }
-                //policyObjectToView["icon"] = utility.getDeviceThumb(policyObjectToView["platform"]);
                 var ownershipType = "None";
                 var deviceGroups = policyObjectFromRestEndpoint["deviceGroups"];
                 if (deviceGroups) {
@@ -210,12 +209,15 @@ policyModule = function () {
         }
         try {
             var url = devicemgtProps["managerHTTPSURL"] + devicemgtProps["backendRestEndpoints"]["appMgt"] +
-                "/apps/mobileapp?field-filter=all";
-            return serviceInvokers.XMLHttp.get(url,
+                      "/applications";
+            var data = {
+              limit: -1
+            };
+            return serviceInvokers.XMLHttp.post(url, data,
                 function (backendResponse) {
                     var response = {};
                     if (backendResponse.status === 200 && backendResponse.responseText) {
-                        var appListFromRestEndpoint = parse(backendResponse.responseText)["appList"];
+                        var appListFromRestEndpoint = parse(backendResponse.responseText)["applications"];
                         var storeApps = [];
                         var i, appObjectFromRestEndpoint, appObjectToView;
                         for (i=0; i<appListFromRestEndpoint.length; i++) {
@@ -223,16 +225,14 @@ policyModule = function () {
                             appObjectToView = {};
                             appObjectToView["appName"] = appObjectFromRestEndpoint["name"];
                             appObjectToView["appId"] = appObjectFromRestEndpoint["id"];
-                            appObjectToView["webUrl"] = appObjectFromRestEndpoint["appmeta"]["weburl"];
-                            if ("webapp" === appObjectFromRestEndpoint["platform"]) {
-                                appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["weburl"];
+                            if ("WEB_CLIP" === appObjectFromRestEndpoint["type"]) {
                                 appObjectToView["type"] = "Web Clip"
                             } else {
-                                appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["package"];
                                 appObjectToView["type"] = "Mobile App"
                             }
-                            appObjectToView["version"] = appObjectFromRestEndpoint["version"];
-                            appObjectToView["platform"] = appObjectFromRestEndpoint["platform"];
+                            appObjectToView["uuid"] = appObjectFromRestEndpoint["applicationReleases"][0]["uuid"];
+                            appObjectToView["version"] = appObjectFromRestEndpoint["applicationReleases"][0]["version"];
+                            appObjectToView["platform"] = appObjectFromRestEndpoint["deviceType"];
                             storeApps.push(appObjectToView);
                         }
                         response.status = "success";
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
index c7701e5cd9..49b71a9d41 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
@@ -202,7 +202,7 @@ function getStoreApps(storeApps, deviceType) {
     var selectedApps = [];
     var i;
     for (i=0; i<storeApps.length; i++) {
-        if (deviceType === storeApps[i].platform || "webapp" === storeApps[i].platform) {
+        if (deviceType === storeApps[i].platform || "ANY" === storeApps[i].platform) {
             selectedApps.push(storeApps[i]);
         }
     }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
index fd34ccc5a6..4ac5cb8620 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
@@ -259,7 +259,7 @@ function getStoreApps(storeApps, deviceType) {
     var selectedApps = [];
     var i;
     for (i=0; i<storeApps.length; i++) {
-        if (storeApps[i].platform === deviceType || "webapp" === storeApps[i].platform) {
+        if (deviceType === storeApps[i].platform || "ANY" === storeApps[i].platform) {
             selectedApps.push(storeApps[i]);
         }
     }