cpee 2.1.10 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 621ce6c077d9353a451b76d21994fa8bb15db1c44cb196e2925754850f8cf69c
-  data.tar.gz: e714da8117190a7e56c57140939c841b6ff03a5da9aa6b5e0f5f4ad64534a20c
+  metadata.gz: efeba53ef2a09db39df28177cc7238d5df7c14277815e0a3f79ada2f7860222d
+  data.tar.gz: 8dd7c732a2067bc8e98ca9c71282baeb76d1e429f66b232cf6f24eccddf188ea
 SHA512:
-  metadata.gz: 74713f528cb6111bbd7db9b353c1a14c0f526ebf109e136586e16892b05d1aaa0aeff6afc7464f4bbefa5939bafbce170cd253768c26f6aeb38b58362c8ceb8f
-  data.tar.gz: 823a965814df7fb7e68119457d6a0f244179e91f3ca9b245dd1ea861a5a92a07e6de5f08339973640e620032a756f60f5c32f79a3346ca40f930cbc2818d7e31
+  metadata.gz: e04e0dc7f1c15874fafb119045594a564c5f956a3609800d7c18717a9e8da5365d86db978c72404c231b2a32421da5f1f8d03a6ae5a516aea7fcb8ba06ee619c
+  data.tar.gz: 5d629666c2a58c1f1545b8222b243ab5f05ca9cc30629979daaa1a286188270d3699ea195176e943fc2cb45ca2a9fd28f350b9ca663fbdfa924f335a539a59f1

data/cockpit/css/ui.css

@@ -135,7 +135,7 @@ ui-tabbed ui-tabbar ui-behind button {
 #areainstance div.section              { vertical-align: middle; height: 100%; }
 #areainstance div.section:nth-child(1) { flex: 0 0 auto;                                                  padding: 0 0.5em 0 0; white-space: nowrap; }
 #areainstance div.section:nth-child(2) { flex: 0 0 auto; border-left: 1px solid var(--x-ui-border-color); padding: 0 0.5em;     white-space: nowrap; }
-#areainstance div.section:nth-child(3) { flex: 1 1 auto; border-left: 1px solid var(--x-ui-border-color); padding: 0 0 0 0.5em; white-space: nowrap; }
+#areainstance div.section:nth-child(3) { flex: 1 1 auto; border-left: 1px solid var(--x-ui-border-color); padding: 0 0 0 0.5em; }
 
 #areainstance div.section:nth-child(1) > div:nth-child(2)             { white-space: normal; text-align: right; }
 
@@ -148,10 +148,9 @@ ui-tabbed ui-tabbar ui-behind button {
 
 #areainstance div.section:nth-child(2) button                       { white-space: normal; width: 6em; height: 5.7em; vertical-align: middle; margin: 0; padding: 0; }
 
-#areainstance div.section:nth-child(3)                                { overflow-y: scroll; }
+#areainstance div.section:nth-child(3)                                { overflow-y: scroll; overflow-x: hidden; display: flex; flex-direction: column; flex-wrap: wrap; justify-content: flex-start; align-content: flex-start; }
 #areainstance div.section:nth-child(3) strong                         { margin:0; padding:0; white-space: normal; font-size: 0.7em; }
-#areainstance div.section:nth-child(3) > div:not(:first-child)        { padding-top: 0.2em; }
-#areainstance div.section:nth-child(3) > div                          { padding-bottom: 0em; }
+#areainstance div.section:nth-child(3) > div                          { padding-bottom: 0.2em; flex: 0 0 auto; padding-right: 1em; }
 #areainstance div.section:nth-child(3) select                         { margin-left: 1em;  }
 #areainstance div.section:nth-child(3) div.additional                 { margin: 0 1em; font-size: 0.9em; }
 
@@ -243,4 +242,4 @@ span.vote {
   overflow: auto;
 }
 #disclaimer p { max-width: 80ex; text-align: justify; }
-#disclaimer input { margin:0; padding:0; vertical-align:baseline; margin-right: 0.5em; }
+#disclaimer input { margin:0; padding:0; vertical-align:bottom; margin-right: 0.5em; }

data/cockpit/js/instance.js

@@ -1,5 +1,5 @@
 var es;
-var suspended_monitoring = false;
+var suspended_redrawing = false;
 var myid = ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
 var paths = '#dat_details input, #dat_details textarea, #dat_details select, #dat_details button, #dat_details [contenteditable], #dat_dataelements input, #dat_dataelements textarea, #dat_dataelements select, #dat_dataelements button, #dat_dataelements [contenteditable], #dat_endpoints input, #dat_endpoints textarea, #dat_endpoints select, #dat_endpoints button, #dat_endpoints [contenteditable], #dat_attributes input, #dat_attributes textarea, #dat_attributes select, #dat_attributes button, #dat_attributes [contenteditable]';
 var loading = false;
@@ -13,7 +13,7 @@ var save = {};
 var node_state = {};
 
 function global_init() {
-  suspended_monitoring = false;
+  suspended_redrawing = false;
   loading = false;
   subscription = undefined;
   subscription_state = 'less';
@@ -280,10 +280,8 @@ function sse() { //{{{
             break;
           case 'attributes':
             monitor_instance_values("attributes");
-            if (!suspended_monitoring) { // or else it would load twice, because dsl changes also trigger
-              if (save['graph_theme'] != data.content.values.theme) {
-                monitor_graph_change(true);
-              }
+            if (save['graph_theme'] != data.content.values.theme) {
+              monitor_graph_change(true);
             }
             break;
           case 'task':
@@ -482,7 +480,11 @@ function adaptor_update() { //{{{
   });
 } //}}}
 function adaptor_init(url,theme,dslx) { //{{{
+  // while inside and svgs are reloaded, do nothing here
+  if (suspended_redrawing) { return; }
   if (save['graph_theme'] != theme) {
+    // while inside and svgs are reloaded, do nothing here
+    suspended_redrawing = true;
     save['graph_theme'] = theme;
     save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
       manifestation.endpoints = save.endpoints_list;
@@ -570,6 +572,9 @@ function adaptor_init(url,theme,dslx) { //{{{
       adaptor_update();
       monitor_instance_pos();
       $('#dat_details').empty();
+
+      // while inside and svgs are reloaded, do nothing here
+      suspended_redrawing = false;
     });
   } else {
     save['graph_adaptor'].update(function(graphrealization){
@@ -580,7 +585,6 @@ function adaptor_init(url,theme,dslx) { //{{{
       format_instance_pos();
     });
   }
-  suspended_monitoring = false;
 } //}}}
 
 function monitor_graph_change(force) { //{{{
@@ -921,7 +925,6 @@ function save_svgfile() {// {{{
 }// }}}
 async function set_testset(testset,exec) {// {{{
   var url = $('body').attr('current-instance');
-  suspended_monitoring = true;
 
   var promises = [];
 

data/cockpit/js/modifiers.js

@@ -42,7 +42,7 @@ function do_mod_save(target) {
   let top = div.attr('data-resource');
   let doc = save['modifiers_additional'][top].save();
   let rep = $('body').attr('current-resources');
-  let now = encodeURIComponent($('div.select select',div).val());
+  let now = $('div.select select',div).val();
 
   var tset = $X('<testset xmlns="http://cpee.org/ns/properties/2.0"/>');
       tset.append(doc.documentElement);
@@ -69,12 +69,13 @@ async function modifiers_display() {
             let clone = document.importNode(document.querySelector('#modifiers template').content,true);
             let t = $(r).text();
             $('> div',clone).attr('data-resource',t);
-            $('div.title *',clone).text(decodeURIComponent(t));
+            $('div.title *',clone).text(decodeURIComponent(t).replace(/^\d*_?/,''));
 
             let cpromises = [];
             $('resource',ses).each(function(_,s) {
-              let opt = $('<option/>');
-              opt.text(decodeURIComponent($(s).text()));
+              let opt = $('<option value=""/>');
+              opt.text(decodeURIComponent($(s).text()).replace(/^\d*_?/,''));
+              opt.attr('value',$(s).text());
               $('div.select select',clone).append(opt);
 
               cpromises.push(
@@ -120,7 +121,8 @@ function modifiers_display_ui(url,top,it,notchanged) {
             save['modifiers_additional'][top].content(attr);
           }
         });
-      }
+      },
+      error: function() {}
     });
   }
 }
@@ -134,7 +136,7 @@ function modifiers_select() {
   });
   $('#modifiers div[data-resource]').each(function(_,r){
     $('select option',r).each(function(_,s){
-      let where = $(r).attr('data-resource') + '/' + encodeURIComponent($(s).text());
+      let where = $(r).attr('data-resource') + '/' + $(s).attr('value');
       let cond = save['modifiers'][where];
       let success = true;
       for (x in cond) {
@@ -142,8 +144,8 @@ function modifiers_select() {
       }
       if (success) {
         let top = $(r).attr('data-resource');
-        let it = encodeURIComponent($(s).text());
-        $('select',r).val($(s).text());
+        let it = $(s).attr('value');
+        $('select',r).val(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.10"
+  s.version          = "2.1.11"
   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."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.11
 platform: ruby
 authors:
 - Juergen eTM Mangler