cpee-worklist 1.0.17 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf102e677abb150275c9f4b01ce89eb120053ba7d3dd49e5b8f76f5a97fdee8
-  data.tar.gz: cec0662273259461355d533c9d3a5a15976369adf30fd6817f40b7d01e2141fa
+  metadata.gz: 06b0d5dfd91cdcb6096eb347897b655c2aaabc38401e90d3df063ef52c26f8dd
+  data.tar.gz: dbdb4b029ba6efe558f402518058e605cc556f1a19f46e519f495c7961029174
 SHA512:
-  metadata.gz: 471180152239ec324890cfd1a8175c1400f2ec132c509070ea698a4f1ef0d4ffcadc0c692c1d223dc32652d6d82ccfce0a0c77807ef499ea21a98cf4fd37e215
-  data.tar.gz: 5cfdf1e5abac3546f527526ee21d42c796b4db1576c78f6922baf7e69da4188d0e47316c037745ccee9dd1c4446cdbafdf6df997a74449354ed093b3a8770924
+  metadata.gz: 7bdee2fb8c40d77622c5c5d08845b51f7e7e4bb659ff2384447c5807baa48504605ed788bdac675b1281b17cc79c1537aba8c603fe82b601c0b38f94b34ebe51
+  data.tar.gz: e234e10ea4a283d5806006d43c284c65be71665c5497588db430b07d852228407af8a139e47e807d88fb92d4c8e4c86936da8337b00a463fc0fed0c103710fb4

data/AUTHORS

@@ -1,3 +1,4 @@
 Jürgen 'eTM' Mangler <juergen.mangler@univie.ac.at>
 Florian 'Triarier' Stertz <florian.stertz@gmail.com>
 Patrik 'The King' Koenig
+Nathaliia 'com-pot' Klievtsova

data/cpee-worklist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-worklist"
-  s.version          = "1.0.17"
+  s.version          = "1.0.19"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Worklist for the cloud process execution engine (cpee.org)"
@@ -15,13 +15,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=2.4.0'
 
-  s.authors          = ['Juergen eTM Mangler','Florian Stertz', 'Patrik Koenig']
+  s.authors          = ['Juergen eTM Mangler','Florian Stertz', 'Patrik Koenig', 'Nataliia Klievtsova']
 
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
   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']=='*' ||
@@ -381,6 +383,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

@@ -58,11 +58,21 @@ ARGV.options { |opt|
   opt.on(wrap("[cpui DIR]        scaffolds a sample html client. New versions might require manual merging if you changed something."))
 	opt.on("")
   opt.on(wrap("[new DIR]         scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
+	opt.on("")
+  opt.on(wrap("[filter URL key]  return all tasks that match a certain filter criterion."))
+	opt.on("")
+  opt.on(wrap("[filter_a URL]    return all tasks that point to abandoned instances."))
+	opt.on("")
+  opt.on(wrap("[delete_a URL]    delete all tasks that point to abandoned instances."))
+	opt.on("")
+  opt.on(wrap("[delete_f URL]    delete all tasks that match a certain filter criterion."))
   opt.parse!
 }
+
 if (ARGV.length <  2) ||
-   (ARGV.length == 2  && !(%w(cpui new).include?(ARGV[0]))) ||
-   (ARGV.length >  2)
+   (ARGV.length == 2  && !(%w(cpui new filter_a delete_a).include?(ARGV[0]))) ||
+   (ARGV.length == 3  && !(%w(filter delete_f).include?(ARGV[0]))) ||
+   (ARGV.length >  3)
   puts ARGV.options
   exit
 end
@@ -78,6 +88,76 @@ if command == 'new'
     FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
     puts 'Directory already exists, updating ...'
   end
+elsif command == 'filter'
+  if p1 !~ /^http/ || ARGV[2] !~ /^\w+=/
+    puts ARGV.options
+    exit
+  end
+  res = Typhoeus.get(File.join(p1,'/'))
+  pname, pkey = ARGV[2].split('=',2)
+  if res.success?
+    doc = XML::Smart.string(res.body)
+    doc.find("/tasks/task[@#{pname}=\"#{pkey}\"]").each do |ele|
+      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
+    exit
+  end
+  res = Typhoeus.get(File.join(p1,'/'))
+  if res.success?
+    doc = XML::Smart.string(res.body)
+    doc.find("/tasks/task").each do |ele|
+      res = Typhoeus.get(File.join(ele.attributes['cpee_base'],ele.attributes['cpee_instance'],'properties','attributes','uuid','/'))
+      if res.success?
+        if res.body != ele.attributes['instance_uuid']
+          puts "#{ele.attributes['callback_id']}; #{ele.attributes['cpee_label']};  #{ele.attributes['cpee_instance']}"
+        else
+          ### TODO check if abandoned or finished to catch the rest of the the mischiefous tasks
+        end
+      else
+        puts "#{ele.attributes['callback_id']}; #{ele.attributes['cpee_label']};  #{ele.attributes['cpee_instance']}"
+      end
+    end
+  end
+elsif command == 'delete_a'
+  if p1 !~ /^http/
+    puts ARGV.options
+    exit
+  end
+  wl = File.join(p1,'/')
+  res = Typhoeus.get(wl)
+  if res.success?
+    doc = XML::Smart.string(res.body)
+    doc.find("/tasks/task").each do |ele|
+      res = Typhoeus.get(File.join(ele.attributes['cpee_base'],ele.attributes['cpee_instance'],'properties','attributes','uuid','/'))
+      if res.success?
+        if res.body != ele.attributes['instance_uuid']
+          Typhoeus.delete File.join(wl,'tasks',ele.attributes['callback_id'])
+        else
+          ### TODO check if abandoned or finished to catch the rest of the the mischiefous tasks
+        end
+      else
+        Typhoeus.delete File.join(wl,'tasks',ele.attributes['callback_id'])
+      end
+    end
+  end
 elsif command == 'cpui'
   insta = "#{curpath}/../ui/"
   if !File.exist?(p1)

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>

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cpee-worklist
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.19
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Florian Stertz
 - Patrik Koenig
+- Nataliia Klievtsova
 bindir: tools
 cert_chain: []
-date: 2025-04-17 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -48,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
@@ -58,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