cpee 2.1.121 → 2.1.122

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d909f1d5117cf3439add6bcfb46571778c8c6c482bc7cd308eb3c2a9c4431f
-  data.tar.gz: fc2d8deeb972a5a57b16b8ebdc2db982b284871386fedbd402dceb9429f8fc10
+  metadata.gz: 5d819e511b5c747cc2fc238f83e6c94aa9fc263e15906b4d62af4bbb7323f52e
+  data.tar.gz: bab3b37ada5e2739d779bda8b19ddf24a307ca95f154b32c0c91e7c3f292ca82
 SHA512:
-  metadata.gz: a929aa173158993c2f96eacea72c1c5fd74302d820493e581f39a00f017303149357a3eedb19a1346d96b3050b29ddc3bacf7b2b873bac4c5fc3f1208dc5b99d
-  data.tar.gz: cde8af038d7911aa40825f71cca4cdd22e8e04767c9840992453bc4cc0d6e297f8d9de94f6e7a6921d66cf3826b3435791384cade92639f62532bf6973e91f0e
+  metadata.gz: c674196d5cef21fa056cdfb64a2ef64ca9381cb68f424de9cddcf6a1d493fcc1e9c7eb618708d2994fd84d76aa6bb20ebb7264bed643b5c7fcdac9bca7486958
+  data.tar.gz: 3cfd5b3ca1df014bd09a2f826f4c80cc112a496fe5750762610c6935874c71a24edae18be0219633eb3348bb0f927717a637b3733e48a73d0eff773691bac00d

data/cockpit/js/instance.js

@@ -1172,25 +1172,6 @@ async function set_testset(testset,exec) {// {{{
   await Promise.all(promises);
 
   document.dispatchEvent(model_loaded);
-
-  $.ajax({
-    type: "GET",
-    url: url + "/properties/state/",
-    dataType: "text",
-    success: function(res){
-      $.ajax({
-        type: "PUT",
-        url: url + "/properties/state/",
-        data: ({value: res}),
-        error: report_failure,
-        success: function(res){
-          if (exec) start_instance();
-        }
-      });
-    }
-  });
-
-
 }// }}}
 
 function load_testsetfile_after() { //{{{

data/cockpit/js/modifiers.js

@@ -143,10 +143,11 @@ function modifiers_select() {
         let top = $(r).attr('data-resource');
         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)});
+        if (typeof(save['modifiers_active'][top]) == "undefined") {
+          // set for page load
+          save['modifiers_active'][top] = it;
         }
+        modifiers_display_ui(rep + 'modifiers/',top,it,save['modifiers_active'][top] == it);
         save['modifiers_active'][top] = it;
       }
     });

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.121"
+  s.version          = "2.1.122"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'mimemagic', '~>0'
   s.add_runtime_dependency 'get_process_mem', '~>0.2'
   s.add_runtime_dependency 'webrick', '~>1.7'
+  s.add_runtime_dependency 'msgpack', '~>1.8'
   s.add_runtime_dependency 'by', '~> 1.1', '>= 1.1.0'
   s.add_runtime_dependency 'concurrent-ruby', '~> 1.3', '>= 1.3.5'
 end

data/lib/cpee/implementation_properties.rb

@@ -158,7 +158,11 @@ module CPEE
             CPEE::Properties::PutStatus::set id, opts, node.first.dump
           end
           if (node = doc.find('/p:properties/p:executionhandler')).any?
-            CPEE::Properties::PutExecutionHandler::set id, opts, node.first.text
+            if doc.find('/p:properties/p:description/*').any?
+              CPEE::Properties::PutExecutionHandler::set id, opts, node.first.text, false
+            else
+              CPEE::Properties::PutExecutionHandler::set id, opts, node.first.text
+            end
           end
 
           %w{dataelements endpoints attributes}.each do |item|
@@ -424,10 +428,7 @@ module CPEE
         doc.find("/*/*").each do |ele|
           val[ele.qname.name] = ele.text unless val.has_key?(ele.qname.name)
         end
-        oldkeys = CPEE::Persistence::extract_list(id,opts,item).to_h.keys
-        newkeys = val.keys
-        del = oldkeys - newkeys
-        CPEE::Persistence::set_list(id,opts,item,val,del)
+        CPEE::Persistence::set_list(id,opts,item,val,true,true)
       end
 
       def response
@@ -514,7 +515,7 @@ module CPEE
           @status = 410
         else
           if CPEE::Persistence::extract_item(id,opts,@r.join('/'))
-            CPEE::Persistence::set_list(id,opts,item,val,val.keys)
+            CPEE::Persistence::set_list(id,opts,item,val,false,true,val.keys)
           else
             @status = 404
           end

data/lib/cpee/persistence.rb

@@ -12,6 +12,7 @@
 # CPEE (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+require 'msgpack'
 require_relative 'attributes_helper'
 require_relative 'message'
 
@@ -30,11 +31,41 @@ module CPEE
       CPEE::Message::wait(opts[:redis],opts[:redis_dyn].call('Temporary Storage Transaction Subscriber'))
     end
 
-    def self::set_list(id,opts,item,values,deleted=[]) #{{{
+    def self::set_list(id,opts,item,values,diff=false,delete=false,deletions=[]) #{{{
       ah = AttributesHelper.new
       attributes = Persistence::extract_list(id,opts,'attributes').to_h
       dataelements = Persistence::extract_list(id,opts,'dataelements').to_h
       endpoints = Persistence::extract_list(id,opts,'endpoints').to_h
+      oldvalues = case item
+        when 'attributes' then attributes
+        when 'endpoints' then endpoints
+        when 'dataelements' then dataelements
+      end
+      if diff
+        deletions = oldvalues.keys - values.keys
+        values.delete_if do |k,v|
+          oldvalues[k] && oldvalues[k] == v
+        end
+      end
+      payload = {
+        :values => oldvalues.merge(values).transform_values{|val| JSON::parse(val) rescue val },
+        :attributes => ah.translate(attributes,dataelements,endpoints),
+      }
+      CPEE::Message::send(
+        :event,
+        File.join(item,'modify'),
+        opts[:url],
+        id,
+        Persistence::extract_item(id,opts,'attributes/uuid'),
+        Persistence::extract_item(id,opts,'attributes/info'),
+        payload,
+        opts[:redis]
+      )
+      payload[:values] = values.transform_values{|val| JSON::parse(val) rescue val }
+      payload[:changed] = values.keys
+      if delete
+        payload[:deleted] = deletions
+      end
       CPEE::Message::send(
         :event,
         File.join(item,'change'),
@@ -42,12 +73,7 @@ module CPEE
         id,
         Persistence::extract_item(id,opts,'attributes/uuid'),
         Persistence::extract_item(id,opts,'attributes/info'),
-        {
-          :changed => values.keys,
-          :deleted => deleted,
-          :values => values.transform_values{|val| JSON::parse(val) rescue val },
-          :attributes => ah.translate(attributes,dataelements,endpoints),
-        },
+        payload,
         opts[:redis]
       )
     end #}}}

data/server/executionhandlers/ruby/connection.rb

@@ -29,9 +29,12 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     tso + 2 > tsn && count > 100
   end # }}}
 
-  def self::inform_state_change(arguments,newstate) # {{{
+  def self::inform_state_change(arguments,newstate,data) # {{{
     controller = arguments[0]
-		controller.notify("state/change", :state => newstate)
+		controller.notify('state/change', :state => newstate)
+    if newstate == :stopped || newstate == :finished
+      controller.notify('dataelements/modify', :eid => 'ex-post', :values => data)
+    end
   end # }}}
   def self::inform_syntax_error(arguments,err,code)# {{{
     # TODO extract spot (code) where error happened for better error handling (ruby 3.1 only)

data/server/resources/topics.xml

@@ -50,6 +50,7 @@
   </topic>
   <topic id='dataelements'>
     <event>change</event>
+    <event>modify</event>
   </topic>
   <topic id='endpoints'>
     <event>change</event>

data/server/routing/end.pid

@@ -1 +1 @@
-26491
+741834

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-26511
+741857

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-26505
+741846

data/server/routing/persist.pid

@@ -1 +1 @@
-26499
+741840

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.121
+  version: 2.1.122
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -171,6 +171,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: by
   requirement: !ruby/object:Gem::Requirement