cpee 2.1.70 → 2.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41f311fdc70aec9386640a09a7331abdd3279d08e532de6a74f019a89d413cd8
-  data.tar.gz: 479b16db900e1270c2124d5b413d3623813bc4b37d8727a8bbce397ea1207953
+  metadata.gz: c21127d24cf9f2a171afb51a060e0ebe7670733f57b60ecc726a4680092c6968
+  data.tar.gz: 5c412f66e52ca5e982cb7e1c36c4ee7f3c92287d0d025445d5aa6f0f0a07c0d6
 SHA512:
-  metadata.gz: 0c6f6a22e4e5d76474b160f780b99a4f4e6355259174cf31f99704512e88863dcc0ee9f17a3c037a0fc44a98730ae8f1f2eff8a749de774eb87f409ecb286b11
-  data.tar.gz: 7b70f1adc92d339b829ef8285fafb7836946d73c6b51e6cf16f0a278ba84cae0a6191897dcdbf3caf61bcd2960643da2a7cbb1b36260ef19a29639659ea3f25b
+  metadata.gz: 77f4006dd5a11a5d7c84723544b9e10b0080c9e71af653914b0f2442d8996300c7612ba7f4f7289117fef5ee48241ed1b15a7d9d784d4c123805afe86934c1fd
+  data.tar.gz: 6ebd11566d148d05ccfdf3c02a0e404f6b76dbdda37d1ffc38b48feefb4b6ab8a7321a8e9c0750a08a371e865fa9290ba1c1a7db99875bc2c5a039adbb610f04

data/cockpit/css/wfadaptor.css

@@ -18,7 +18,7 @@
   --wfadaptor-exec-passive: #729fcf;
   --wfadaptor-exec-active: #ef2929;
   --wfadaptor-exec-active-text: #cc0000;
-  --wfadaptor-exec-vote: #8ae234;
+  --wfadaptor-exec-vote: #8de5bcff;
   --wfadaptor-exec-vote-text: #73d216;
   --wfadaptor-highlight: #0081c7;
   --wfadaptor-base: #000000;

data/cockpit/js/instance.js

@@ -7,6 +7,11 @@ var loading = false;
 var subscription;
 var subscription_state = 'less';
 var graph_changed = new Event("graph:changed", {"bubbles":true, "cancelable":false});
+var graph_theme = null;
+var graph_position = null;
+var graph_highlight = null;
+var graph_highlight_tasks = []
+var graph_highlight_color = null;
 var model_loaded = new Event("model:loaded", {"bubbles":true, "cancelable":false});
 var save = {};
     save['endpoints'] = undefined;
@@ -23,7 +28,6 @@ function global_init() {
   save['state']= undefined;
   save['dsl'] = undefined;
   save['activity_red_states'] = {}
-  save['activity_blue_states'] = {}
   save['graph'] = undefined;
   save['graph_theme'] = undefined;
   save['graph_adaptor'] = undefined;
@@ -125,6 +129,17 @@ function cockpit() { //{{{
         uidash_toggle_vis_tab($('#instance'));
         uidash_toggle_vis_tab($('#parameters'));
       }
+      if (q.theme) { graph_theme = q.theme; }
+      if (q.position) { graph_position = q.position == 'false' ? 'false' : 'true'; }
+      if (q.highlight) {
+        graph_highlight = q.highlight.match(/((a\d+,)+)([a-z0-9]{6,8})$/);
+        if (graph_highlight.length > 0) {
+          graph_highlight_color = graph_highlight[3];
+          graph_highlight_tasks = graph_highlight[1].split(',');
+          graph_highlight_tasks.pop();
+          graph_highlight = graph_highlight[0];
+        }
+      }
       if (q.monitor && q.load) {
         if (q.load.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
@@ -291,7 +306,7 @@ async function sse() { //{{{
             } else {
               monitor_instance_values("attributes");
             }
-            if (save['graph_theme'] != data.content.values.theme) {
+            if (typeof data.content.values.theme !== "undefined" && save['graph_theme'] != data.content.values.theme) {
               monitor_graph_change(true);
             }
             break;
@@ -344,6 +359,8 @@ function monitor_instance(cin,rep,load,exec) {// {{{
   $('#parameters ui-content ui-area > button').attr('disabled','disabled');
   $('#dat_details').empty();
 
+  $('#modifiers > div').remove();
+
   url = $("body").attr('current-instance');
 
   $.ajax({
@@ -371,7 +388,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
       $("#current-track").show();
       $("#current-track").attr('href','track.html?monitor=' + url);
       var q = $.parseQuerySimple();
-      history.replaceState({}, '', '?' + (q.min || q.min=="" ? "min&" : "") + 'monitor='+url);
+      history.replaceState({}, '', '?' + (graph_position ? "position=" + graph_position + "&" : "") + (graph_highlight ? "highlight=" + graph_highlight + "&" : "") + (graph_theme ? "theme=" + graph_theme + "&" : "") + (q.min || q.min=="" ? "min&" : "") + 'monitor='+url);
 
       // Change url to return to current instance when reloading (because new subscription is made)
       $("input[name=votecontinue]").prop( "checked", false );
@@ -552,6 +569,7 @@ function adaptor_update() { //{{{
 function adaptor_init(url,theme,dslx) { //{{{
   // while inside and svgs are reloaded, do nothing here
   if (suspended_redrawing) { return; }
+  if (graph_theme) { theme = graph_theme; }
   if (save['graph_theme'] != theme) {
     // while inside and svgs are reloaded, do nothing here
     suspended_redrawing = true;
@@ -559,6 +577,18 @@ function adaptor_init(url,theme,dslx) { //{{{
     save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
       manifestation.endpoints = save.endpoints_list;
       graphrealization.draw_labels = function(max,labels,dimensions,striped) {
+        // highlight
+
+        if (graph_highlight) {
+          graph_highlight_tasks.forEach((ele) => {
+            let er = $('g[element-id=' + ele + ']').attr('element-row');
+            styletext = 'svg rect[element-row="'+ er + '"], div.graphlast[element-row="'+ er + '"] {  fill: #' + graph_highlight_color + ' !important; background-color:  #' + graph_highlight_color + ' !important; } ';
+            $('head').append('<style type="text/css">' + styletext + '</style>');
+            scroll_into_view(ele);
+          })
+        }
+
+        // labels
         $('#graphcanvas').css('grid-row', '1/span ' + (max.row + 2));
         if (striped == true) {
           if (!$('#graphgrid').hasClass('striped')) {
@@ -782,6 +812,7 @@ function adaptor_init(url,theme,dslx) { //{{{
         }
       };
       adaptor_update();
+
       monitor_instance_pos();
       $('#dat_details').empty();
 
@@ -857,6 +888,12 @@ function monitor_instance_state() {// {{{
 }// }}}
 
 function monitor_instance_pos() {// {{{
+  if (graph_position && graph_position == 'false') {
+    save['instance_pos'] = [];
+    format_visual_clear();
+    format_instance_pos();
+    return;
+  };
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "GET",
@@ -885,33 +922,24 @@ function monitor_instance_running(content,event) {// {{{
       format_visual_remove(content.activity,"active");
     }
     save['activity_red_states'][content['activity-uuid']] = true
-    setTimeout(() => {delete save['activity_red_states'][content['activity-uuid']]},5000);
+    setTimeout(() => {delete save['activity_red_states'][content['activity-uuid']]},1);
   }
 } // }}}
 function monitor_instance_pos_change(content) {// {{{
+  if (graph_position && graph_position == 'false') { return; }
   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");
-      }
+      format_visual_add(b.position,"passive",false);
     });
   }
   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");
-      }
+      format_visual_add(b.position,"passive",false);
     });
   }
   if (content['unmark']) {
     $.each(content['unmark'],function(a,b){
-      if (save['activity_blue_states'][b.uuid]) {
-        format_visual_remove(b.position,"passive")
-      }
-      save['activity_blue_states'][b.uuid] = true
-      setTimeout(() => {delete save['activity_blue_states'][b.uuid]},5000);
+      format_visual_remove(b.position,"passive",false)
     });
   }
   if (!content['at'] && !content['unmark'] && !content['after'] && !content['wait']) {
@@ -944,15 +972,11 @@ function monitor_instance_state_change(notification) { //{{{
       monitor_instance_pos();
     }
     if (notification == "running") {
-      // // we cant do that, because the events might not be ordered. so jus remove all the blue ones.
-      // format_visual_clear();
-
       for (const [key, ele] of Object.entries(node_state)) {
         for (i=0; i<ele.passive; i++) {
           format_visual_remove(key,'passive');
         }
       }
-      // save_blue_states has to be left alone, because we dont know the uuid
     }
 
     var but = "";
@@ -1424,15 +1448,18 @@ async function load_testset_handlers(url,testset,vals) {// {{{
   return Promise.all(promises);
 }// }}}
 
-function format_visual_add(what,cls) {//{{{
+function format_visual_add(what,cls,sum=true) {//{{{
   if (node_state[what] == undefined)
     node_state[what] = {};
   if (node_state[what][cls] == undefined)
     node_state[what][cls] = 0;
   node_state[what][cls] += 1;
+  if (sum == false && node_state[what][cls] > 1) {
+    node_state[what][cls] = 1;
+  }
   format_visual_set(what);
 }//}}}
-function format_visual_remove(what,cls) {//{{{
+function format_visual_remove(what,cls,sum=true) {//{{{
   if (node_state[what] == undefined)
     node_state[what] = {};
   if (node_state[what][cls] == undefined)
@@ -1440,6 +1467,9 @@ function format_visual_remove(what,cls) {//{{{
   node_state[what][cls] -= 1;
   if (node_state[what][cls] < 0)
     node_state[what][cls] = 0;
+  if (sum == false && node_state[what][cls] < 0) {
+    node_state[what][cls] = 0;
+  }
   format_visual_set(what);
 }//}}}
 

data/cockpit/js/modifiers.js

@@ -144,6 +144,9 @@ function modifiers_select() {
         let it = $(s).attr('value');
         $('select',r).val(it);
         modifiers_display_ui(rep + 'modifiers/',top,it,save['modifiers_active'][top] == it);
+        if (save['modifiers_active'][top] != it) {
+           modifiers_update({"target": $('select',r)});
+        }
         save['modifiers_active'][top] = it;
       }
     });