Merge branch 'main' into packet-filters

Author: ibmpowerpc

front/src/configurators.py

@@ -1,6 +1,6 @@
 from abc import abstractmethod
 import json
-
+from celery_app import app
 from flask import jsonify, make_response, request, Response
 from flask_login import current_user
 from miminet_model import Network, Simulate, db
@@ -221,6 +221,7 @@ def __conf_sims_delete(self):
         # Remove all previous simulations (after configuration update)
         sims = Simulate.query.filter(Simulate.network_id == self._cur_network.id).all()
         for s in sims:
+            app.control.revoke(s.task_guid, terminate=False)
             db.session.delete(s)
 
         self._cur_network.network = json.dumps(self._json_network)

front/src/static/netfront_f.js

@@ -3,6 +3,7 @@ let global_cy = undefined;
 let global_eh = undefined;
 var NetworkUpdateTimeoutId = -1;
 let NetworkCache = [];
+let lastSimulationId = 0
 
 let packetsNotFiltered = null;
 let packetFilterState = {
@@ -1305,7 +1306,7 @@ const CheckSimulation = function (simulation_id)
         url: '/check_simulation?simulation_id=' + simulation_id + '&network_guid=' + network_guid,
         data: '',
         success: function(data, textStatus, xhr) {
-
+            lastSimulationId = data.simulation_id
             // If we got 210 (processing) wait 2 sec and call themself again
             if (xhr.status === 210)
             {
@@ -1330,7 +1331,9 @@ const CheckSimulation = function (simulation_id)
         },
         error: function(xhr) {
             console.log('Cannot check simulation id = ' + simulation_id);
-            SetNetworkPlayerState(-1);
+            if (lastSimulationId == simulation_id){
+                SetNetworkPlayerState(-1);
+            }
         },
         contentType: "application/json",
         dataType: 'json'
@@ -1386,8 +1389,8 @@ const InsertWaitingTimeHelper = function(time_filter) {
         data: '',
         success: function(data) {
             const queue_size = parseInt(data.size);
-
-            if ($('#NetworkPlayerLabel').text().startsWith("Шаг:")) {
+            if (!$('#NetworkPlayer button:first').prop('disabled')) {
+                console.log($('#NetworkPlayer button:first').prop('disabled'))
                 return;
             } else if (queue_size <= 1) {
                 $('#NetworkPlayerLabel').text("Ожидание 10-15 сек.");