fix: [trackers] fix remove object + improve url navigation

Author: Terrtia

bin/lib/ail_core.py

@@ -115,9 +115,25 @@ def get_obj_queued():
 def get_objects_tracked():
     return AIL_OBJS_TRACKED  # TODO add new test to check if == sorted() return True
 
+def get_nb_objects_tracked():
+    return len(AIL_OBJS_TRACKED)
+
 def is_tracked_object(obj_type):
     return obj_type in AIL_OBJS_TRACKED
 
+def is_tracked_objects(obj_types):
+    for obj_type in obj_types:
+        if not is_tracked_object(obj_type):
+            return False
+    return True
+
+def sanitize_tracked_objects(objs):
+    l_types = []
+    for obj in objs:
+        if is_tracked_object(obj):
+            l_types.append(obj)
+    return l_types
+
 def get_objects_retro_hunted():
     return AIL_OBJS_RETRO_HUNTED
 

var/www/blueprints/hunters.py

@@ -172,12 +172,21 @@ def show_tracker():
             new_filter = request.form.get(f'{obj_type}_obj')
             if new_filter:
                 filter_obj_types.append(obj_type)
-        if sorted(filter_obj_types) == list(Tracker.get_objects_tracked()):
+        filter_obj_types = ail_core.sanitize_tracked_objects(filter_obj_types)
+        if len(filter_obj_types) == ail_core.get_nb_objects_tracked():
             filter_obj_types = []
-    else:
-        tracker_uuid = request.args.get('uuid', None)
-        date_from = request.args.get('date_from')
-        date_to = request.args.get('date_to')
+        filter_obj_types = ','.join(filter_obj_types)
+        if filter_obj_types:
+            return redirect(url_for('hunters.show_tracker', uuid=tracker_uuid, date_from=date_from, date_to=date_to, filter=filter_obj_types))
+        else:
+            return redirect(url_for('hunters.show_tracker', uuid=tracker_uuid, date_from=date_from, date_to=date_to))
+
+    tracker_uuid = request.args.get('uuid', None)
+    date_from = request.args.get('date_from')
+    date_to = request.args.get('date_to')
+    filter_obj_types = ail_core.sanitize_tracked_objects(request.args.get('filter', '').split(','))
+    if len(filter_obj_types) == ail_core.get_nb_objects_tracked():
+        filter_obj_types = []
 
     res = Tracker.api_check_tracker_acl(tracker_uuid, user_org, user_id, user_role, 'view')
     if res:  # invalid access