cockpit/js/instance.js in cpee-2.1.43 vs cockpit/js/instance.js in cpee-2.1.44

@@ -17,11 +17,12 @@
   loading = false;
   subscription = undefined;
   subscription_state = 'less';
   save['state']= undefined;
   save['dsl'] = undefined;
-  save['activity_states'] = {}
+  save['activity_red_states'] = {}
+  save['activity_blue_states'] = {}
   save['graph'] = undefined;
   save['graph_theme'] = undefined;
   save['graph_adaptor'] = undefined;
   save['endpoints_cache'] = {};
   save['endpoints_list'] = {};
@@ -680,29 +681,61 @@
     }
   });
 }// }}}
 
 function monitor_instance_running(content,event) {// {{{
-  if (save['state'] == "stopping") return;
   if (event == "calling") {
-    if (!save['activity_states'][content['activity-uuid']]) {
-      save['activity_states'][content['activity-uuid']] = true
+    if (!save['activity_red_states'][content['activity-uuid']]) {
+      save['activity_red_states'][content['activity-uuid']] = true
       format_visual_add(content.activity,"active")
     }
   } else if (event == "manipulating") {
-    if (!save['activity_states'][content['activity-uuid']]) {
-      save['activity_states'][content['activity-uuid']] = true
+    if (!save['activity_red_states'][content['activity-uuid']]) {
+      save['activity_red_states'][content['activity-uuid']] = true
       format_visual_add(content.activity,"active")
     }
   } else if (event == "done") {
-    if (save['activity_states'][content['activity-uuid']]) {
-      save['activity_states'][content['activity-uuid']] = true
-      format_visual_remove(content.activity,"active")
-      setTimeout(() => {delete save['activity_states'][content['activity-uuid']]},5000);
+    if (save['activity_red_states'][content['activity-uuid']]) {
+      format_visual_remove(content.activity,"active");
     }
+    save['activity_red_states'][content['activity-uuid']] = true
+    setTimeout(() => {delete save['activity_red_states'][content['activity-uuid']]},5000);
   }
 } // }}}
+function monitor_instance_pos_change(content) {// {{{
+  if (content['at']) {
+    $.each(content['at'],function(a,b){
+      if (!save['activity_blue_states'][b.uuid]) {
+        save['activity_blue_states'][b.uuid] = true
+        format_visual_add(b.position,"passive");
+      }
+    });
+  }
+  if (content['after']) {
+    $.each(content['after'],function(a,b){
+      if (!save['activity_blue_states'][b.uuid]) {
+        save['activity_blue_states'][b.uuid] = true
+        format_visual_add(b.position,"passive");
+      }
+    });
+  }
+  if (content['unmark']) {
+    $.each(content['unmark'],function(a,b){
+      if (save['activity_blue_states'][b.uuid]) {
+        format_visual_remove(b.position,"passive")
+        console.log('rrrrr');
+      }
+      save['activity_blue_states'][b.uuid] = true
+      setTimeout(() => {delete save['activity_blue_states'][b.uuid]},5000);
+    });
+  }
+  if (!content['at'] && !content['unmark'] && !content['after'] && !content['wait']) {
+    monitor_instance_pos();
+  }
+} // }}}
+
+
 function monitor_instance_state_change(notification) { //{{{
   if ($('#trackcolumn').length > 0) {
     if (notification == "finished" || notification == "abandoned") {
       parent.closeIFrame(window.location.search);
     }
@@ -761,25 +794,9 @@
     }
 
     $("#state_text").text(notification);
   }
 }   //}}}
-function monitor_instance_pos_change(content) {// {{{
-  if (content['unmark']) {
-    $.each(content['unmark'],function(a,b){
-      format_visual_remove(b.position,"passive")
-    });
-  }
-  if (content['at']) {
-    $.each(content['at'],function(a,b){
-      format_visual_add(b.position,"passive");
-    });
-  }
-  if (!content['at'] && !content['unmark'] && !content['after'] && !content['wait']) {
-    monitor_instance_pos();
-  }
-} // }}}
-
 function monitor_instance_vote_add(parts) {// {{{
   var ctv = $("#votes");
 
   astr = '';
   if ($("input[name=votecontinue]").is(':checked'))