Merge branch 'dmgt-ra/certificate/bug' into 'master'

Fix certification deletion issue in devicemgt react app

Closes product-iots#299

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

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",

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();
     }
-}
+}

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;