Add vue to render list of received&sent commands

Alexis Koralewski
1 parent f70471e8
Showing 6 changed files with 99 additions and 8 deletions Show diff stats
CHANGELOG
src/core/pyros_django/api/serializers.py
src/core/pyros_django/api/urls.py
src/core/pyros_django/api/views.py
src/core/pyros_django/dashboard/templates/dashboard/agent_detail.html
src/core/pyros_django/dashboard/templates/dashboard/agents_state.html
-12-10-2022 (AKo): v0.6.2.0
+14-10-2022 (AKo): v0.6.2.0
+	- Add vue to render list of received&sent commands
+	
+13-10-2022 (AKo): v0.6.2.0
 	- Fixing restarting agent in auto mode
 	- Improving get_specific_cmds usage
 	- Add new fields in agent detail command list
@@ -99,6 +99,10 @@ class FullSequenceSerializer(serializers.ModelSerializer):
         extra_fields = ["pyros_user", "albums"]
  
  
+class AgentCmdSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AgentCmd
+        fields = "__all__"
  
 class AgentSurveySerializer(serializers.ModelSerializer):
     class Meta:
@@ -12,6 +12,7 @@ router.register(r&#39;full_sequences&#39;, views.FullSequenceViewSet)
 router.register(r'scientific_programs', views.ScientificProgramViewSet)
 router.register(r'sp_period', views.SPPeriodViewSet)
 router.register(r'agent_survey', views.AgentSurveyViewSet)
+router.register(r'agent_cmd', views.AgentCmdViewSet)
  
 urlpatterns = [
     path('', include(router.urls)),
@@ -19,4 +20,5 @@ urlpatterns = [
     path('api-token-auth/', obtain_auth_token, name='api_token_auth'),
     path("submit_sequence", views.submit_sequence_with_json,
          name="api_submit_sequence"),
+    path("agent_cmd/<str:agent_name>",views.AgentCmdViewSet.as_view({'get': 'list'}))
 ] + router.urls
@@ -6,8 +6,8 @@ from rest_framework.permissions import IsAuthenticated, AllowAny
 from rest_framework.decorators import api_view, permission_classes, action
 from django.core.validators import ValidationError
 from src.core.pyros_django.user_manager import views as user_views
-from api.serializers import AgentSurveySerializer, AlbumSerializer, FullSequenceSerializer, PlanSerializer, SPPeriodSerializer, ScientificProgramSerializer, SequenceSerializer, UserSerializer
-from common.models import PyrosUser, SP_Period, ScientificProgram, Sequence, Album, Plan, UserLevel, SP_Period_User, AgentSurvey
+from api.serializers import AgentSurveySerializer, AlbumSerializer, FullSequenceSerializer, PlanSerializer, SPPeriodSerializer, ScientificProgramSerializer, SequenceSerializer, UserSerializer, AgentCmdSerializer
+from common.models import PyrosUser, SP_Period, ScientificProgram, Sequence, Album, Plan, UserLevel, SP_Period_User, AgentSurvey, AgentCmd
 from routine_manager.functions import check_sequence_file_validity
 from rest_framework.request import Request
 from django.db.models import Q
@@ -256,4 +256,32 @@ class AgentSurveyViewSet(viewsets.ModelViewSet):
         date_minus_two_days =  datetime_now - timedelta(days=2)
         date_minus_two_days = date_minus_two_days.replace(tzinfo=timezone.utc)
         agents = agents.exclude(updated__lt=date_minus_two_days)
-        return agents
 \ No newline at end of file
+        return agents
+
+class AgentCmdViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows users to view their sequences.
+    """
+    queryset = AgentCmd.objects.all()
+    serializer_class = AgentCmdSerializer
+    permission_classes = [IsAuthenticated]
+    http_method_names = ["get"]
+    def get_queryset(self):
+        agent_name = self.request.query_params.get('agent_name')
+        number = self.request.query_params.get('number')
+        if agent_name is None:
+            if "agent_name" in self.kwargs:
+                agent_name = self.kwargs["agent_name"]
+            else:
+                agent_name = None
+        if agent_name is not None:
+            commands_sent_by_agent = AgentCmd.get_commands_sent_by_agent(agent_name)
+            commands_recivied_by_agent = AgentCmd.get_commands_sent_to_agent(agent_name)
+            agent_cmds = commands_sent_by_agent | commands_recivied_by_agent
+            agent_cmds = agent_cmds.exclude(full_name="get_specific_cmds")
+            agent_cmds = agent_cmds.order_by("-s_deposit_time")
+            if number:
+                number = int(number)
+                agent_cmds = agent_cmds[:number]
+            return agent_cmds
+        return AgentCmd.objects.all().order_by("-id")
 \ No newline at end of file
@@ -131,6 +131,45 @@
         </div>
     {% endif %}
     <br><h2> Commands <span style="color:green;">received</span> & <span style="color:blue;">sent</span> </h2><br>
+    <div>
+        <table
+            class="table table-bordered tablesorter" id="cmdtable">
+            <thead>
+                <tr>
+                    <th>Command</th>
+                    <th>Sender</th>
+                    <th>Recipient</th>
+                    <th>Status </th>
+                    <th>Deposit (UTC)</th>
+                    <th>Read (UTC)</th>
+                    <th>Validity (s)</th>
+                    <th>Timeout (s)</th>
+                    <th>Exec start (UTC)</th>
+                    <th>Exec end (UTC)</th>
+                    <th>Result</th>
+                </tr>
+            </thead>
+            <tbody>
+                
+                
+                <tr v-for="command in commands" v-bind:class="'{{agent_name}}' == command.sender ? 'blue' : 'green'">
+                    <td> [[ command.full_name ]] </td>
+                    
+                    <td v-if="command.sender.includes('@') || command.sender == 'System'">[[ command.sender]]</td>
+                    <td v-else> <a v-bind:href="`/dashboard/agent_detail/${command.sender}`">[[ command.sender]]</a></td>
+                    <td> <a v-bind:href="`/dashboard/agent_detail/${command.recipient}`">[[ command.recipient ]]</a></td>
+                    <td> [[ command.state ]] </td>
+                    <td> [[ command.s_deposit_time]] </td>
+                    <td> [[ command.r_read_time]]</td>
+                    <td> [[ command.validity_duration]] </td>
+                    <td> [[ command.exec_timeout]] </td>
+                    <td> [[ command.r_start_time]]</td>
+                    <td> [[ command.r_end_time]]</td>
+                    <td> [[ command.result ]] </td>
+                </tr>
+            </tbody>
+        </table>
+    {% comment %} 
     {% if commands %}
     <div>
         <table
@@ -198,6 +237,7 @@
         <p> No commands has been send by this agent.</p>
         {% endif %}
 </div>
+{% endcomment %}
 {% if not error_message %}
 <div>
 <h2> Last logs : </h2>
@@ -281,7 +321,6 @@
             fetch("/api/agent_survey/"+agent_name+"?format=json").then(response => response.json()).then(function(data){
                 agent_status.text(data.status);
                 agent_mode.text(data.mode);
-                console.log(main_agent_status)
                 if (main_agent_status == "EXITING"){
                     document.getElementsByClassName("agent_status")[index].parentElement.children[3].querySelector("#startbtn").disabled = true;
                     document.getElementsByClassName("agent_status")[index].parentElement.children[3].querySelector("#stopbtn").disabled = true;
@@ -316,7 +355,13 @@
     function refresh_agent_info(){
  
         fetch("/api/agent_survey/{{agent_name}}?format=json").then(response => response.json()).then(function(data){
-            app.agent = data;
+            app2.agent = data;
+        });
+    }
+    function refresh_cmds_table(){
+        
+        fetch("/api/agent_cmd/{{agent_name}}?format=json&number=20").then(response => response.json()).then(function(data){
+            app.commands = data;
         });
     }
     $(document).ready(function() {
@@ -324,13 +369,23 @@
         refresh_agent_info();
         //setInterval(refresh_command_column,5000);
         setInterval(refresh_agent_info,4000);
+        refresh_cmds_table();
+        setInterval(refresh_cmds_table,10000);
     });
     var app = new Vue({
         delimiters:["[[","]]"],
+        el: '#cmdtable',
+        data: {
+            commands: [],
+            is_sender: false,
+        }
+    });
+    var app2 = new Vue({
+        delimiters:["[[","]]"],
         el: '#agent_info',
         data: {
             agent: []
         }
-    })
+    });
 </script>
 {% endblock %}
 \ No newline at end of file
@@ -87,7 +87,6 @@
     function refresh_status_table(){
  
         fetch("/api/agent_survey/?format=json").then(response => response.json()).then(function(data){
-            console.log(data);
             app.agents = data;
         });
     }