cpee 2.1.43 → 2.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe2b979ffa5688e94ddc6d344f22a000ec05ee8431829a540a1e029eb6447e0
-  data.tar.gz: e806711116591e7cbf37132ca4950d6b824b90b85fe9806b8d0a2aa2186fe43d
+  metadata.gz: 59ce47d58b06ffcc164ea6aa7a65763c687fcf93a056f1dd7bdef5af21123fca
+  data.tar.gz: 5b668300d35d8d4aeea11855142b010cc3f32e10a57de58fcdcedc9829fa81eb
 SHA512:
-  metadata.gz: 7216bbfcc02ef6e23c085bdbe521f8f84d39c752415bc2e46498fcd658b88eed491e1387bbd85147b1defd9cc49b8872ff82d22ceabe9e4dd4d4035c25c53bf5
-  data.tar.gz: 25de4d62af41f018535725dbd93b493c0e12161553c070f6c1db6dcadcca4dac9621d442eabdb8c9cfc33783e7e622cc7c8e76682a13542c262bcb6d0f0c9ddd
+  metadata.gz: 3bc91dd497c1a1db18920bef11121a5e3446ec01ef15cea2ffb8159683193c4c3c1dd1e0974bf395acfde1a94ec64bad70586a384b92305a287da794ab0c426a
+  data.tar.gz: a31663de83aaf09956d3a303c59e5421f13211da02cf74d63d1834b3a726c8860b6928a39fa5cf4dface4c3d476dfa29b4208a87e22b2ea20d9ccf7534416682

data/cockpit/js/instance.js

@@ -19,7 +19,8 @@ function global_init() {
   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;
@@ -682,25 +683,57 @@ function monitor_instance_pos() {// {{{
 }// }}}
 
 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") {
@@ -763,22 +796,6 @@ function monitor_instance_state_change(notification) { //{{{
     $("#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");
 

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.43"
+  s.version          = "2.1.44"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/server/executionhandlers/ruby/connection.rb

@@ -200,6 +200,10 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     true
   end # }}}
 
+  def activity_uuid
+    @handler_activity_uuid
+  end
+
   def inform_activity_done # {{{
     @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
     @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.43
+  version: 2.1.44
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl