cpee-worklist 1.0.18 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa5816bad86bff070a0112a66e1b42f1ab72d59c21b7422b28b9662727ce18f3
-  data.tar.gz: 26d2f0839f38b7f34cc838692f574aeef309b07634d7cb647bf1704f4714d450
+  metadata.gz: 5f6fef7844b1068dc25aedad2ad96649e3821e68e8056a385ed7ff752f53071c
+  data.tar.gz: ec643d4a0e368d4e584aebf23352b38c23b71481965c07064cbc7bd0db67ca42
 SHA512:
-  metadata.gz: 8ea7ef4c13a0ab028453607d218251b1f5c5431cbb1db86e634a5becf81c1a0761c8fb97ff894231c0244847abe2d8d32af3c03e9f6037a3b0e0e5711ff30c6e
-  data.tar.gz: 2927e84f1f4677e9017d0a725ab773c5c65dade72cdb888f47e710e2f3f70ee8ba2609d3f6659cc25101ec07b3ee7b5bbb4185e9da2a31cd6f4a1600d2682cb1
+  metadata.gz: 9fda76f7240d70935a5f8e7066d083dfbf4658e89b68772c268e86cc1ce5b6dd2b0f0ca620d8905a746be30e922fdccf331adbeb16eb7637720245dd4671d38e
+  data.tar.gz: 33ad966f1cc9302ed2f84dac3d5ffa485b971b56c4f7a53974c04500271e25faa19b0c977c21a207977861c46d3fd6f34de534ac1e0b6ddbdf9a42539cdefc48

data/cpee-worklist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-worklist"
-  s.version          = "1.0.18"
+  s.version          = "1.0.20"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Worklist for the cloud process execution engine (cpee.org)"
@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
   s.add_runtime_dependency 'json', '~> 2.1'
-  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.56'
+  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.88'
   s.add_runtime_dependency 'chronic_duration', '~> 0.10', '>= 0.10.6'
 end

data/lib/cpee-worklist/implementation.rb

@@ -25,6 +25,7 @@ require 'riddl/utils/fileserve'
 require 'cpee/redis'
 require 'cpee/message'
 require 'cpee/persistence'
+require 'cpee/statemachine'
 require 'cpee/attributes_helper'
 require 'cpee/implementation_notifications'
 require 'cpee/implementation_callbacks'
@@ -91,7 +92,7 @@ module CPEE
         activity['deadline'] = @p.first.name == 'deadline' ? ((Time.now + ChronicDuration.parse(@p.shift.value)) rescue nil): nil
         activity['restrictions'] = []
         rests = JSON::parse(@p.shift.value) rescue nil
-        activity['restrictions'] << rests unless rests.nil?
+        activity['restrictions'] += rests unless rests.nil?
         if @p.first.name == 'prioritization'
           val = @p.shift.value
           activity['prioritization'] = (JSON::parse(val) rescue val.gsub(/[\[\]()<>"']/,'').split(/\s*[,;]\s*/))
@@ -163,7 +164,7 @@ module CPEE
           activity = @a[0].activities[index]
           if !force && activity['collected'] && (activity['collected'] + 1) < activity['collect_max']
             activity['collected'] += 1
-            activity['restrictions'] << { "restriction" => { "mode" => "prohibit", "id" => @r[-3] } }
+            activity['restrictions'] << { "mode" => "prohibit", "id" => @r[-3] }
             @a[0].activities.serialize
             @a[0].notify('user/finish', :callback_id => activity['id'], :user => @r[-3], :role => activity['role'],  :instance_uuid => activity['uuid'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'])
           elsif !force && activity['handling'] == 'always'
@@ -237,7 +238,8 @@ module CPEE
               @a[0].activities.each do |activity|
                 restrict = false
                 activity['restrictions'].each do |restriction|
-                  restrict = true if restriction['restriction']['mode'] == 'prohibit' && restriction['restriction']['id'] == @r[-2]
+                  restriction = restriction[0] if  restriction.is_a? Array
+                  restrict = true if restriction['mode'] == 'prohibit' && restriction['id'] == @r[-2]
                 end
                 if (
                      activity['role']=='*' ||
@@ -366,11 +368,10 @@ module CPEE
 
       ### set redis_cmd to nil if you want to do global
       ### at least redis_path or redis_url and redis_db have to be set if you do global
-      opts[:redis_path]                 ||= 'redis.sock' # use e.g. /tmp/redis.sock for global stuff. Look it up in your redis config
       opts[:redis_db]                   ||= 0
-      ### optional redis stuff
-      opts[:redis_url]                  ||= nil
-      opts[:redis_cmd]                  ||= 'redis-server --port 0 --unixsocket #redis_path# --unixsocketperm 600 --pidfile #redis_pid# --dir #redis_db_dir# --dbfilename #redis_db_name# --databases 1 --save 900 1 --save 300 10 --save 60 10000 --rdbcompression yes --daemonize yes'
+      opts[:redis_url]                  ||= 'unix://redis.sock' # sadly we have to do this for now
+      opts[:redis_unixsocket]           ||= true
+      opts[:redis_cmd]                  ||= 'redis-server --port #redis_port# --unixsocket #redis_path# --unixsocketperm 600 --pidfile #redis_pid# --dir #redis_db_dir# --dbfilename                  #redis_db_name# --databases 1 --save 900 1 --save 300 10 --save 60 10000 --rdbcompression yes --daemonize yes --protected-mode no'
       opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
       opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
 
@@ -381,6 +382,8 @@ module CPEE
       opts[:sse_keepalive_frequency]    ||= 10
       opts[:sse_connections]            = {}
 
+      opts[:statemachine]               = CPEE::DummyStateMachine.new
+
       opts[:finalize_frequency]         ||= 10
 
       CPEE::Message::set_workers(1)

data/lib/cpee-worklist/routing/end.rb

@@ -41,7 +41,7 @@ Daemonite.new do |opts|
       on.pmessage do |pat, what, message|
         _, worker, key = what.split(':',3)
         index = message.index(' ')
-        instance = message[0...index]
+        instance, uuid = message[0...index].split(',')
         opts[:redis].multi do |multi|
           multi.srem("worklist:#{instance}/callbacks",key)
           multi.del("worklist:#{instance}/callback/#{key}/uuid")

data/lib/cpee-worklist/routing/forward-events.rb

@@ -41,7 +41,7 @@ Daemonite.new do |opts|
       on.pmessage do |pat, what, message|
         index = message.index(' ')
         mess = message[index+1..-1]
-        instance = message[0...index]
+        instance, uuid = message[0...index].split(',')
         type, worker, event = what.split(':',3)
         topic = ::File::dirname(event)
         name = ::File::basename(event)

data/lib/cpee-worklist/routing/forward-votes.rb

@@ -67,7 +67,7 @@ Daemonite.new do |opts|
       on.pmessage do |pat, what, message|
         index = message.index(' ')
         mess = message[index+1..-1]
-        instance = message[0...index]
+        instance, uuid = message[0...index].split(',')
         type, worker, event = what.split(':',3)
         topic = ::File::dirname(event)
         name = ::File::basename(event)

data/tools/cpee-worklist

@@ -101,6 +101,20 @@ elsif command == 'filter'
       puts "#{ele.attributes['callback_id']}; #{ele.attributes['cpee_label']};  #{ele.attributes['cpee_instance']}"
     end
   end
+elsif command == 'delete_f'
+  if p1 !~ /^http/ || ARGV[2] !~ /^\w+=/
+    puts ARGV.options
+    exit
+  end
+  wl = File.join(p1,'/')
+  res = Typhoeus.get(wl)
+  pname, pkey = ARGV[2].split('=',2)
+  if res.success?
+    doc = XML::Smart.string(res.body)
+    doc.find("/tasks/task[@#{pname}=\"#{pkey}\"]").each do |ele|
+      Typhoeus.delete File.join(wl,'tasks',ele.attributes['callback_id'])
+    end
+  end
 elsif command == 'filter_a'
   if p1 !~ /^http/
     puts ARGV.options

data/ui/container.html

@@ -35,6 +35,51 @@
     <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
     <script type="text/javascript" src="/js_libs/marked.min.js"></script>
 
+    <script>
+      function load_script(src) {
+        // Initialize scripts queue
+        if (load_script.scripts === undefined) {
+          load_script.scripts = [];
+          load_script.index = -1;
+          load_script.loading = false;
+          load_script.next = function() {
+            if (load_script.loading) return;
+
+            // Load the next queue item
+            load_script.loading = true;
+            var item = load_script.scripts[++load_script.index];
+            var head = document.getElementsByTagName('head')[0];
+            var script = document.createElement('script');
+            script.type = 'text/javascript';
+            script.src = item.src;
+            // When complete, start next item in queue and resolve this item's promise
+            script.onload = () => {
+              load_script.loading = false;
+              if( load_script.index < load_script.scripts.length - 1 ) load_script.next();
+              item.resolve();
+            };
+            head.appendChild(script);
+          };
+        };
+
+        // Adding a script to the queue
+        if (src) {
+          // Check if already added
+          for (var i=0; i < load_script.scripts.length; i++) {
+              if( load_script.scripts[i].src == src ) return load_script.scripts[i].promise;
+          }
+          // Add to the queue
+          var item = { src: src };
+          item.promise = new Promise(resolve => {item.resolve = resolve;});
+          load_script.scripts.push(item);
+          load_script.next();
+        }
+
+        // Return the promise of the last queue item
+        return load_script.scripts[ load_script.scripts.length - 1 ].promise;
+      };
+    </script>
+
     <link rel="stylesheet" href="css/container.css" type="text/css"/>
   </head>
   <body is='x-ui-'></body>

data/ui/js/structured.js

@@ -290,7 +290,7 @@ function do_work(taskid,taskidurl) { //{{{
         url: res.form,
         dataType: 'text',
         success: async (iform) => {
-          let end = false;;
+          let end = false;
           let evaltext = '';
           let rel = res.form.match(/.*\//)[0];
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-worklist
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.20
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 - Nataliia Klievtsova
 bindir: tools
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -49,7 +49,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.56
+        version: 2.1.88
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.56
+        version: 2.1.88
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Worklist for the cloud process execution engine (cpee.org)
 test_files: []