cpee-worklist 1.0.16 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6a55694476f53122fb39aa05551f55b84e14f5c622b0ef1d935215cf69c8f06
-  data.tar.gz: 81b84ac33a7b8bb4fa581641a08c118caeffed34037732f21a522f79d98ccfc4
+  metadata.gz: aa5816bad86bff070a0112a66e1b42f1ab72d59c21b7422b28b9662727ce18f3
+  data.tar.gz: 26d2f0839f38b7f34cc838692f574aeef309b07634d7cb647bf1704f4714d450
 SHA512:
-  metadata.gz: 0f057175e245d17e490347ff2b0b931c909b891b86382daf4accd13fe9a7f352827d856db405fd8ce8e776ee7f17fffd5c5e28127e00879a0c0dcbf117676900
-  data.tar.gz: 6cbb6ba01ea9eb928c71f973bfdd687c5eb560c566ae826d2720c9b0ef008e786884dead4547000c2bb7e797c696d656966ac2561899113974769e3fb738835a
+  metadata.gz: 8ea7ef4c13a0ab028453607d218251b1f5c5431cbb1db86e634a5becf81c1a0761c8fb97ff894231c0244847abe2d8d32af3c03e9f6037a3b0e0e5711ff30c6e
+  data.tar.gz: 2927e84f1f4677e9017d0a725ab773c5c65dade72cdb888f47e710e2f3f70ee8ba2609d3f6659cc25101ec07b3ee7b5bbb4185e9da2a31cd6f4a1600d2682cb1

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.16"
+  s.version          = "1.0.18"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Worklist for the cloud process execution engine (cpee.org)"
@@ -15,7 +15,7 @@ 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/'

data/lib/cpee-worklist/implementation.rb

@@ -276,7 +276,7 @@ module CPEE
         index = @a[0].activities.index{ |c| c["id"] == @r.last }
         if index
           activity = @a[0].activities[index]
-          activity['user'].push @r[-3]if CPEE::Worklist::User::ok?(@a[0].opts,activity,@r[-3]) && !activity['user'].include?(@r[-3])
+          activity['user'].push @r[-3] if CPEE::Worklist::User::ok?(@a[0].opts,activity,@r[-3]) && !activity['user'].include?(@r[-3])
           info = CPEE::Worklist::User::info(@a[0].opts,activity,@r[-3])
           @a[0].activities.serialize
           @a[0].notify('user/take', :user => @r[-3], :callback_id => activity['id'], :cpee_callback => activity['url'], :cpee_instance => activity['cpee_instance'],:instance_uuid => activity['uuid'], :cpee_base => activity['cpee_base'], :cpee_label => activity['label'], :cpee_activity => activity['cpee_activity_id'], :orgmodel => activity['orgmodel'], :organisation => info)

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,62 @@ 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 == '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/js/structured.js

@@ -369,7 +369,6 @@ function do_work(taskid,taskidurl) { //{{{
                   var form_data = $(this).serializeArray();
                   var send_data = {};
                   var headers = {};
-                  console.log(res);
                   if (res.collect || res.always) { headers['CPEE-UPDATE'] = 'true'; }
                   send_data['user'] = $("input[name=user-name]").val();
                   send_data['raw'] = form_data;

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cpee-worklist
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.18
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Florian Stertz
 - Patrik Koenig
-autorequire:
+- Nataliia Klievtsova
 bindir: tools
 cert_chain: []
-date: 2025-04-15 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -122,7 +122,6 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Worklist for the cloud process execution engine (cpee.org)
 test_files: []