cpee 2.1.53 → 2.1.54

data/cockpit/themes/felix/theme.js

@@ -63,11 +63,7 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
-    var focus_ele  = $(':focus',tab);
-    var focus_path = focus_ele.attr('data-relaxngui-path');
-    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
-        tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
       save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
       var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
@@ -78,21 +74,16 @@ function WFAdaptorManifestation(adaptor) {
       if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
-      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       var nn = $X($(node).serializeXML());
           nn.removeAttr('svg-id');
           nn.removeAttr('svg-type');
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
+
+      tab.empty();
+      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       save['details'].content(nn);
-      // only after setting content can we set the focus and position. It might loose some stuff nonetheless.
-      if (focus_ele.length > 0) {
-        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
-        ele.focus();
-        if (ele.setSelectionRange) {
-          ele.setSelectionRange(focus_pos,focus_pos);
-        }
-      }
+
       format_visual_forms();
     }
   }; //}}}
@@ -212,8 +203,17 @@ function WFAdaptorManifestation(adaptor) {
             $(nodes).each(function(key,str) {
               nodes[key] = $X(str);
             });
+            let svgids = [];
             $(nodes).each(function(key,node){
-              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              svgids.push($(node).attr('svg-id'));
+            });
+            svgids.sort((a,b) => {
+              if (a > b) { return -1; }
+              else if (a < b) { return 1; }
+              else { return 0; }
+            });
+            svgids.forEach(svgid => {
+              var target = self.adaptor.description.get_node_by_svg_id(svgid);
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
               localStorage.removeItem('marked');
@@ -1269,28 +1269,33 @@ function WFAdaptorManifestation(adaptor) {
         return 'vertical';
       },
       'resolve_symbol': function(node) {
+        let alist = []
         let plist = []
-        let dirty = false
-        $('*:not(:has(*))',node).each(function(i,n) {
-          let lines = n.textContent.split(/(\r\n)|\n|;/)
-          for (const l of lines) {
-            if (l != null) {
-              let m0 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*=/)
-              if (m0 != null) {
-                plist.push(m0[1])
-              }
-              let m1 = l.match(/=[^=].*data\.([a-z0-9A-Z_]+)/)
-              let m2 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*$/)
-              if (m1 != null && !plist.includes(m1[1])) {
-                dirty = true
-              }
-              if (m2 != null && !plist.includes(m2[1])) {
-                dirty = true
-              }
-            }
+
+        var regassi =      /data\.([a-zA-Z_]+)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+        var reg_not_assi = /data\.([a-zA-Z_]+)\s*/g;
+        $ ('call > parameters > arguments > *, call > code > *, loop[condition], alternative[condition]',node).each(function(i,n) {
+          let item;
+          if (n.hasAttribute('condition')) {
+            item = n.getAttribute('condition');
+          } else {
+            item = n.textContent;
+          }
+          if (n.parentNode.nodeName == 'arguments' && item.charAt(0) != '!' ) { return }
+
+          let indices = [];
+
+          for (const match of item.matchAll(regassi)) {
+            indices.push(match.index);
+            alist.push(match[1]);
+          }
+          for (const match of item.matchAll(reg_not_assi)) {
+            const arg1 = match[1];
+            if (indices.includes(match.index)) { continue; }
+            if (!alist.includes(arg1)) { plist.push(arg1); }
           }
         })
-        if (dirty) { return 'start_event'; }
+        if (plist.length > 0) { return 'start_event'; }
       },
       'closing_symbol': 'end',
       'col_shift': function(node) {

data/cockpit/themes/model/theme.js

@@ -63,11 +63,7 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
-    var focus_ele  = $(':focus',tab);
-    var focus_path = focus_ele.attr('data-relaxngui-path');
-    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
-        tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
       save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
       var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
@@ -78,20 +74,16 @@ function WFAdaptorManifestation(adaptor) {
       if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
-      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       var nn = $X($(node).serializeXML());
           nn.removeAttr('svg-id');
           nn.removeAttr('svg-type');
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
+
+      tab.empty();
+      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       save['details'].content(nn);
-      if (focus_ele.length > 0) {
-        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
-        ele.focus();
-        if (ele.setSelectionRange) {
-          ele.setSelectionRange(focus_pos,focus_pos);
-        }
-      }
+
       format_visual_forms();
     }
   }; //}}}
@@ -211,8 +203,17 @@ function WFAdaptorManifestation(adaptor) {
             $(nodes).each(function(key,str) {
               nodes[key] = $X(str);
             });
+            let svgids = [];
             $(nodes).each(function(key,node){
-              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              svgids.push($(node).attr('svg-id'));
+            });
+            svgids.sort((a,b) => {
+              if (a > b) { return -1; }
+              else if (a < b) { return 1; }
+              else { return 0; }
+            });
+            svgids.forEach(svgid => {
+              var target = self.adaptor.description.get_node_by_svg_id(svgid);
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
               localStorage.removeItem('marked');

data/cockpit/themes/packed/theme.js

@@ -63,11 +63,7 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
-    var focus_ele  = $(':focus',tab);
-    var focus_path = focus_ele.attr('data-relaxngui-path');
-    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
-        tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
       save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
       var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
@@ -78,20 +74,16 @@ function WFAdaptorManifestation(adaptor) {
       if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
-      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       var nn = $X($(node).serializeXML());
           nn.removeAttr('svg-id');
           nn.removeAttr('svg-type');
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
+
+      tab.empty();
+      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       save['details'].content(nn);
-      if (focus_ele.length > 0) {
-        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
-        ele.focus();
-        if (ele.setSelectionRange) {
-          ele.setSelectionRange(focus_pos,focus_pos);
-        }
-      }
+
       format_visual_forms();
     }
   }; //}}}
@@ -211,8 +203,17 @@ function WFAdaptorManifestation(adaptor) {
             $(nodes).each(function(key,str) {
               nodes[key] = $X(str);
             });
+            let svgids = [];
             $(nodes).each(function(key,node){
-              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              svgids.push($(node).attr('svg-id'));
+            });
+            svgids.sort((a,b) => {
+              if (a > b) { return -1; }
+              else if (a < b) { return 1; }
+              else { return 0; }
+            });
+            svgids.forEach(svgid => {
+              var target = self.adaptor.description.get_node_by_svg_id(svgid);
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
               localStorage.removeItem('marked');
@@ -1233,28 +1234,33 @@ function WFAdaptorManifestation(adaptor) {
         return 'vertical';
       },
       'resolve_symbol': function(node) {
+        let alist = []
         let plist = []
-        let dirty = false
-        $('*:not(:has(*))',node).each(function(i,n) {
-          let lines = n.textContent.split(/(\r\n)|\n|;/)
-          for (const l of lines) {
-            if (l != null) {
-              let m0 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*=/)
-              if (m0 != null) {
-                plist.push(m0[1])
-              }
-              let m1 = l.match(/=[^=].*data\.([a-z0-9A-Z_]+)/)
-              let m2 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*$/)
-              if (m1 != null && !plist.includes(m1[1])) {
-                dirty = true
-              }
-              if (m2 != null && !plist.includes(m2[1])) {
-                dirty = true
-              }
-            }
+
+        var regassi =      /data\.([a-zA-Z_]+)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+        var reg_not_assi = /data\.([a-zA-Z_]+)\s*/g;
+        $ ('call > parameters > arguments > *, call > code > *, loop[condition], alternative[condition]',node).each(function(i,n) {
+          let item;
+          if (n.hasAttribute('condition')) {
+            item = n.getAttribute('condition');
+          } else {
+            item = n.textContent;
+          }
+          if (n.parentNode.nodeName == 'arguments' && item.charAt(0) != '!' ) { return }
+
+          let indices = [];
+
+          for (const match of item.matchAll(regassi)) {
+            indices.push(match.index);
+            alist.push(match[1]);
+          }
+          for (const match of item.matchAll(reg_not_assi)) {
+            const arg1 = match[1];
+            if (indices.includes(match.index)) { continue; }
+            if (!alist.includes(arg1)) { plist.push(arg1); }
           }
         })
-        if (dirty) { return 'start_event'; }
+        if (plist.length > 0) { return 'start_event'; }
       },
       'closing_symbol': 'end',
       'col_shift': function(node) {

data/cockpit/themes/preset/theme.js

@@ -63,11 +63,7 @@ function WFAdaptorManifestation(adaptor) {
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
-    var focus_ele  = $(':focus',tab);
-    var focus_path = focus_ele.attr('data-relaxngui-path');
-    var focus_pos  = focus_ele.prop('selectionStart');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
-        tab.empty();
     if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
       save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
       var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
@@ -78,21 +74,16 @@ function WFAdaptorManifestation(adaptor) {
       if (save['endpoints_list'][$(node).attr('endpoint')] && (!save['endpoints_list'][$(node).attr('endpoint')].startsWith('http') || save['endpoints_list'][$(node).attr('endpoint')].match(/^https?-/))) {
         $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
       }
-      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       var nn = $X($(node).serializeXML());
           nn.removeAttr('svg-id');
           nn.removeAttr('svg-type');
           nn.removeAttr('svg-subtype');
           nn.removeAttr('svg-label');
+
+      tab.empty();
+      save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       save['details'].content(nn);
-      // only after setting content can we set the focus and position. It might loose some stuff nonetheless.
-      if (focus_ele.length > 0) {
-        var ele = $('[data-relaxngui-path="' + focus_path + '"]',tab)[0];
-        ele.focus();
-        if (ele.setSelectionRange) {
-          ele.setSelectionRange(focus_pos,focus_pos);
-        }
-      }
+
       format_visual_forms();
     }
   }; //}}}
@@ -212,8 +203,17 @@ function WFAdaptorManifestation(adaptor) {
             $(nodes).each(function(key,str) {
               nodes[key] = $X(str);
             });
+            let svgids = [];
             $(nodes).each(function(key,node){
-              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              svgids.push($(node).attr('svg-id'));
+            });
+            svgids.sort((a,b) => {
+              if (a > b) { return -1; }
+              else if (a < b) { return 1; }
+              else { return 0; }
+            });
+            svgids.forEach(svgid => {
+              var target = self.adaptor.description.get_node_by_svg_id(svgid);
               del_ui_pos(target)
               self.adaptor.description.remove(null,target);
               localStorage.removeItem('marked');
@@ -1235,28 +1235,33 @@ function WFAdaptorManifestation(adaptor) {
         return 'vertical';
       },
       'resolve_symbol': function(node) {
+        let alist = []
         let plist = []
-        let dirty = false
-        $('*:not(:has(*))',node).each(function(i,n) {
-          let lines = n.textContent.split(/(\r\n)|\n|;/)
-          for (const l of lines) {
-            if (l != null) {
-              let m0 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*=/)
-              if (m0 != null) {
-                plist.push(m0[1])
-              }
-              let m1 = l.match(/=[^=].*data\.([a-z0-9A-Z_]+)/)
-              let m2 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*$/)
-              if (m1 != null && !plist.includes(m1[1])) {
-                dirty = true
-              }
-              if (m2 != null && !plist.includes(m2[1])) {
-                dirty = true
-              }
-            }
+
+        var regassi =      /data\.([a-zA-Z_]+)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+        var reg_not_assi = /data\.([a-zA-Z_]+)\s*/g;
+        $ ('call > parameters > arguments > *, call > code > *, loop[condition], alternative[condition]',node).each(function(i,n) {
+          let item;
+          if (n.hasAttribute('condition')) {
+            item = n.getAttribute('condition');
+          } else {
+            item = n.textContent;
+          }
+          if (n.parentNode.nodeName == 'arguments' && item.charAt(0) != '!' ) { return }
+
+          let indices = [];
+
+          for (const match of item.matchAll(regassi)) {
+            indices.push(match.index);
+            alist.push(match[1]);
+          }
+          for (const match of item.matchAll(reg_not_assi)) {
+            const arg1 = match[1];
+            if (indices.includes(match.index)) { continue; }
+            if (!alist.includes(arg1)) { plist.push(arg1); }
           }
         })
-        if (dirty) { return 'start_event'; }
+        if (plist.length > 0) { return 'start_event'; }
       },
       'closing_symbol': 'end',
       'col_shift': function(node) {

data/cockpit/track.html

@@ -56,7 +56,10 @@
     <script type="text/javascript" src="js/parameters.js"></script>
     <script type="text/javascript" src="js/track.js"></script>
     <script type="text/javascript" src="js/modifiers.js"></script>
+    <script type="text/javascript" src="js/resources.js"></script>
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
+    <link rel="stylesheet" href="css/resources-label.css" type="text/css"/>
+    <link rel="stylesheet" href="css/resources-svg.css" type="text/css" data-include-export="true"/>
     <link rel="stylesheet" href="css/track.css" type="text/css"/>
   </head>
   <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">
@@ -126,6 +129,7 @@
           </div>
         </div>
         <div id='graphgrid'>
+          <div class="resource-label" style="display: none"></div>
           <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
         </div>
       </div>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.53"
+  s.version          = "2.1.54"
   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/routing/end.pid

@@ -0,0 +1 @@
+1109498

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

@@ -0,0 +1 @@
+1109507

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+1109504

data/server/routing/persist.pid

@@ -0,0 +1 @@
+1109501

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.53
+  version: 2.1.54
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -171,7 +171,8 @@ files:
 - cockpit/contrib/tree_example.svg
 - cockpit/css/graph.css
 - cockpit/css/model.css
-- cockpit/css/resources.css
+- cockpit/css/resources-label.css
+- cockpit/css/resources-svg.css
 - cockpit/css/track.css
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
@@ -815,9 +816,13 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
+- server/routing/end.pid
 - server/routing/end.rb
+- server/routing/forward-events-00.pid
 - server/routing/forward-events.rb
+- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
+- server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.pid
 - server/server.rb