Merge pull request #271 from XuHugo/channel

Allow to delete an agent

src/api-engine/api/models.py

@@ -509,7 +509,7 @@ class Node(models.Model):
         Agent,
         help_text="Agent of node",
         null=True,
-        related_name="agent",
+        related_name="node",
         on_delete=models.CASCADE
     )
     # network = models.ForeignKey(

src/api-engine/api/routes/agent/views.py

@@ -231,13 +231,13 @@ def update(self, request, pk=None):
         serializer = AgentUpdateBody(data=request.data)
         if serializer.is_valid(raise_exception=True):
             name = serializer.validated_data.get("name")
-            urls = serializer.validated_data.get("urls")
-            organization = serializer.validated_data.get("organization")
+            #urls = serializer.validated_data.get("urls")
+            #organization = request.user.organization
             try:
                 Agent.objects.get(name=name)
             except ObjectDoesNotExist:
                 pass
-            Agent.objects.filter(id=pk).update(name=name, urls=urls, organization=organization)
+            Agent.objects.filter(id=pk).update(name=name)
 
             return Response(status=status.HTTP_202_ACCEPTED)
 
@@ -281,16 +281,22 @@ def partial_update(self, request, pk=None):
     )
     def destroy(self, request, pk=None):
         """
-        Delete Agent
-
         Delete agent
+
+        :param request: destory parameter
+        :param pk: primary key
+        :return: none
+        :rtype: rest_framework.status
         """
         try:
-            agent = Agent.objects.get(id=pk)
+            if request.user.is_administrator:
+                agent = Agent.objects.get(id=pk)
+            else:
+                raise CustomError("User can't delete agent！")
         except ObjectDoesNotExist:
             raise ResourceNotFound
         else:
-            if agent.organization is not None:
+            if agent.node.count():
                 raise ResourceInUse
             agent.delete()
 

src/dashboard/src/pages/Operator/Agent/Agent.js

@@ -261,7 +261,7 @@ class Agent extends PureComponent {
       });
     } else {
       dispatch({
-        type: 'agent/releaseAgent',
+        type: 'agent/deleteAgent',
         payload: agent.id,
         callback: this.deleteCallback,
       });