From 9f2b6598a9168444e3282b8e7b4c95e9457d72ec Mon Sep 17 00:00:00 2001
From: Jayasanka Weerasinghe <jayasanka.sack@gmail.com>
Date: Tue, 7 Jan 2020 11:50:21 +0530
Subject: [PATCH] Fix certification deletion issue in devicemgt react app

---
 .../mgt/cert/jaxrs/api/CertificateManagementAdminService.java | 3 ++-
 .../jaxrs/api/impl/CertificateManagementAdminServiceImpl.java | 4 +++-
 .../Configurations/Certificates/CertificateTable.js           | 3 +--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
index 6fed010f65..993060707a 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
@@ -306,8 +306,9 @@ public interface CertificateManagementAdminService {
 
     @DELETE
     @Path("/{serialNumber}")
+    @Consumes(MediaType.WILDCARD)
     @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
+            consumes = MediaType.WILDCARD,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "DELETE",
             value = "Deleting an SSL Certificate",
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java
index 697aadc1a8..506fcac51e 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.impl;
 
+import javax.ws.rs.core.MediaType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.CertificateManagementAdminService;
@@ -145,6 +146,7 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
 
     @DELETE
     @Path("/{serialNumber}")
+    @Consumes(MediaType.WILDCARD)
     public Response removeCertificate(@PathParam("serialNumber") String serialNumber) {
         RequestValidationUtil.validateSerialNumber(serialNumber);
 
@@ -328,4 +330,4 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
         }
         return Response.status(Response.Status.OK).entity("invalid").build();
     }
-}
\ No newline at end of file
+}
diff --git a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Configurations/Certificates/CertificateTable.js b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Configurations/Certificates/CertificateTable.js
index 97cbb331fa..1dcb03e397 100644
--- a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Configurations/Certificates/CertificateTable.js
+++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/components/Configurations/Certificates/CertificateTable.js
@@ -114,6 +114,7 @@ class CertificateTable extends React.Component {
             {headers: {'Content-Type': 'application/json'}}
         ).then(res => {
             if (res.status === 200) {
+                this.fetch();
                 notification["success"]({
                     message: "Done",
                     duration: 4,
@@ -202,8 +203,6 @@ class CertificateTable extends React.Component {
         }
     ];
 
-
-
     render() {
         const {data, pagination, loading} = this.state;