cpee 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c55f39b3a28510aa125fab8be30c6abefcda2ecea411b37193c85659ce87ad60
-  data.tar.gz: 28efcb5ebe9c46f4b1c0e107f557b7ac4ccc295d254c9a5515812f94420d8e1b
+  metadata.gz: 37a2b6910315c8913216a368e40556013da8a33e5887adb75729a52ead89daba
+  data.tar.gz: 93b34b46c2e9db0586ce251a51e388f668b128cf497cb1ba95920cbe5424e09b
 SHA512:
-  metadata.gz: 80afb6a0631c42f8ce45f90b545067f85384c32da9964f61857a07314ae1252dbfb19f833581de426c788f2cf2fe52d409451e44b71f63aa1bf286c922f6c80f
-  data.tar.gz: b15f56166f86bd72b791d8ef23ccb41d0eec8d840073777a2315e18993a2e88db071472e956c3b5f43afce5189461111b3326bdc7e9f48c3c7cd7d37ae0eb4fa
+  metadata.gz: f6ed4c4157ebb113589f14c1ab020c4199b30b3e673547b48522cf7cc901a4cbfb70b3ffeb7c21f942df2e151d474a5f7662f64ed1fff4ac60005424e403e83f
+  data.tar.gz: 87d605938e321c920c969aaf525e6fb7213e9eeef18ef99884175e5d75d14e25f793f1953d55b79dccce61e8270c5d222061c9d10c75fc18d4af9df3726df23d

data/cockpit/css/ui.css

@@ -129,11 +129,13 @@ ui-tabbed ui-tabbar ui-behind button {
 #areaendpoints button.relaxngui_control { display: none; }
 #areaattributes button.relaxngui_control { display: none; }
 
+#areainstance                          { height: 100%; }
+#areainstance > div                    { display: flex; height: 100%; }
 #areainstance input[type=file]         { display: none; }
-#areainstance div.section              { display: table-cell; vertical-align: middle; }
-#areainstance div.section:nth-child(1) {                                                  padding: 0 0.5em 0 0; white-space: nowrap; }
-#areainstance div.section:nth-child(2) { border-left: 1px solid var(--x-ui-border-color); padding: 0 0.5em;     white-space: nowrap; }
-#areainstance div.section:nth-child(3) { border-left: 1px solid var(--x-ui-border-color); padding: 0 0 0 0.5em; white-space: nowrap; }
+#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(1) > div:nth-child(2)             { white-space: normal; text-align: right; }
 
@@ -144,9 +146,14 @@ ui-tabbed ui-tabbar ui-behind button {
 #areainstance div.section:nth-child(1) button[name=loadtestsetfile] { white-space: normal; width: 10em; height: 3.5em; margin-left: 0.2em; }
 #areainstance div.section:nth-child(1) button[name=loadmodelfile]   { white-space: normal; width: 10em; height: 2em;   margin-top: 0.2em; }
 
-#areainstance div.section:nth-child(2) button                       { white-space: normal; width: 6em; height: 4.5em; vertical-align: middle; margin: 0; padding: 0; }
-#areainstance div.section:nth-child(3) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
-#areainstance div.section:nth-child(3) button[name=loadmodeltype]   { white-space: normal; width: 10em; height: 2em; }
+#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) strong                         { margin:0; padding:0; white-space: normal; font-size: 1em; }
+#areainstance div.section:nth-child(3) > div:not(:first-child)        { padding-top: 0.5em; }
+#areainstance div.section:nth-child(3) > div                          { padding-bottom: 0.2em; }
+#areainstance div.section:nth-child(3) select                         { margin-left: 1em;  }
+#areainstance div.section:nth-child(3) div.additional                 { margin-left: 1em;  }
 
 #areaexecution input { padding: 0; margin:0; }
 #areaexecution table.x-ui-compact { width: 100%; }

data/cockpit/edit.html

@@ -144,29 +144,32 @@
           </table>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="instance" id="areainstance" class="inactive"> <!--{{{-->
-          <div class='section'>
-            <div>
-              <form id='fuckchrome'>
-                <input type='file' name='testsetfile' id='testsetfile'/>
-              </form>
-              <button title='save a testset includes various settings, subscriptions and a model' name="save" disabled=""><div>save</div><div class="hidden" id='lastsavedline'>(last: <span id="lastsaved"></span>)</div></button>
-              <button title='a testset includes various settings, subscriptions or a model' name="loadtestsetfile">load testset</button>
-            </div>
-            <div>
-              <input type='file' name='modelfile' id='modelfile'/>
-              <button title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' name="loadmodelfile">load model</button>
-            </div>
-          </div><div class='section'>
-            <a id="savetestsetfile" href="" download=""></a>
-            <a id="savesvgfile" href="" download=""></a>
-            <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save testset</button>
-            <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg graph</button>
-          </div><div class='section'>
-            <div>
-              Current model: <span id='currentmodel'></span>
-            </div>
-            <div>
-              <button title='a testset includes various settings, subscriptions and a model' name="loadmodeltype">set model type</button>
+          <div>
+            <div class='section'>
+              <div>
+                <form id='fuckchrome'>
+                  <input type='file' name='testsetfile' id='testsetfile'/>
+                </form>
+                <button title='save a testset includes various settings, subscriptions and a model' name="save" disabled=""><div>save</div><div class="hidden" id='lastsavedline'>(last: <span id="lastsaved"></span>)</div></button>
+                <button title='a testset includes various settings, subscriptions or a model' name="loadtestsetfile">load testset</button>
+              </div>
+              <div>
+                <input type='file' name='modelfile' id='modelfile'/>
+                <button title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' name="loadmodelfile">load model</button>
+              </div>
+            </div><div class='section'>
+              <a id="savetestsetfile" href="" download=""></a>
+              <a id="savesvgfile" href="" download=""></a>
+              <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save testset</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg graph</button>
+            </div><div class='section' id='modifiers'>
+              <template id="item">
+                <div>
+                  <div class='title'><strong></strong></div>
+                  <div class='select'><select/></div>
+                  <div class='additional'></div>
+                </div>
+              </template>
             </div>
           </div>
         </ui-area> <!--}}}-->

data/cockpit/index.html

@@ -146,28 +146,31 @@
           </table>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="instance" id="areainstance" class="inactive"> <!--{{{-->
-          <div class='section'>
-            <div>
-              <form id='fuckchrome'>
-                <input type='file' name='testsetfile' id='testsetfile'/>
-              </form>
-              <button title='a template includes various settings, subscriptions or a (partial) model' name="loadtestset">load template</button><button title='a testset includes various settings, subscriptions or a model' name="loadtestsetfile">load testset</button>
-            </div>
-            <div>
-              <input type='file' name='modelfile' id='modelfile'/>
-              <button title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' name="loadmodelfile">load model</button>
-            </div>
-          </div><div class='section'>
-            <a id="savetestsetfile" href="" download=""></a>
-            <a id="savesvgfile" href="" download=""></a>
-            <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save testset</button>
-            <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg graph</button>
-          </div><div class='section'>
-            <div>
-              Current model: <span id='currentmodel'></span>
-            </div>
-            <div>
-              <button title='a testset includes various settings, subscriptions and a model' name="loadmodeltype">set model type</button>
+          <div>
+            <div class='section'>
+              <div>
+                <form id='fuckchrome'>
+                  <input type='file' name='testsetfile' id='testsetfile'/>
+                </form>
+                <button title='a template includes various settings, subscriptions or a (partial) model' name="loadtestset">load template</button><button title='a testset includes various settings, subscriptions or a model' name="loadtestsetfile">load testset</button>
+              </div>
+              <div>
+                <input type='file' name='modelfile' id='modelfile'/>
+                <button title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' name="loadmodelfile">load model</button>
+              </div>
+            </div><div class='section'>
+              <a id="savetestsetfile" href="" download=""></a>
+              <a id="savesvgfile" href="" download=""></a>
+              <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save testset</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg graph</button>
+            </div><div class='section' id='modifiers'>
+              <template id="item">
+                <div>
+                  <div class='title'><strong></strong></div>
+                  <div class='select'><select/></div>
+                  <div class='additional'></div>
+                </div>
+              </template>
             </div>
           </div>
         </ui-area> <!--}}}-->

data/cockpit/js/instance.js

@@ -28,6 +28,8 @@ function global_init() {
   save['details'] = undefined;
   save['details_target'] = undefined;
   save['instance_pos'] = [];
+  save['modifiers'] = {};
+  save['modifiers_active'] = {};
   node_state = {};
 }
 
@@ -95,6 +97,7 @@ function cockpit() { //{{{
   $("input[name=votecontinue]").click(check_subscription);
   $("input[name=testsetfile]").change(load_testsetfile_after);
   $("input[name=modelfile]").change(load_modelfile_after);
+  $("#modifiers").on('change','div.select select',function(e){ modifiers_update(e); });
 
   $.ajax({
     url: $('body').attr('current-templates'),
@@ -276,7 +279,6 @@ function sse() { //{{{
             break;
           case 'attributes':
             monitor_instance_values("attributes");
-            monitor_instance_transformation();
             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);
@@ -313,7 +315,6 @@ function sse() { //{{{
   monitor_instance_values("dataelements");
   monitor_instance_values("endpoints");
   monitor_instance_values("attributes");
-  monitor_instance_transformation();
   monitor_instance_dsl();
   monitor_instance_state();
 } //}}}
@@ -444,6 +445,11 @@ function monitor_instance_values(val) {// {{{
           });
         });
       } else if(val == "attributes") {
+        if ($('#modifiers > div').length == 0) {
+          modifiers_display().then(modifiers_select);
+        } else {
+          modifiers_select();
+        }
         var text = $(" > attributes > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
         $('#title').text(text);
         document.title = text;
@@ -632,19 +638,6 @@ function monitor_instance_state() {// {{{
     }
   });
 }// }}}
-function monitor_instance_transformation() {// {{{
-  var url = $('body').attr('current-instance');
-  $.ajax({
-    type: "GET",
-    url: url + "/properties/attributes/modeltype/",
-    success: function(res){
-      $("#currentmodel").text(res);
-    },
-    error: function() {
-      $("#currentmodel").text('???');
-    }
-  });
-}// }}}
 
 function monitor_instance_pos() {// {{{
   var url = $('body').attr('current-instance');
@@ -1159,14 +1152,15 @@ async function load_testset_handlers(url,testset,vals) {// {{{
       if ($("*",han).length == 0) {
         $.ajax({
           type: "DELETE",
-          url: url + "/notifications/subscriptions/" + vals[suburl],
+          url: url + "/notifications/subscriptions/" + vals[suburl] + '/'
         })
+        delete vals[suburl];
       } else {
         let inp = load_testset_extract_handlers([],han,suburl);
         promises.push(
           $.ajax({
             type: "PUT",
-            url: url + "/notifications/subscriptions/" + vals[suburl],
+            url: url + "/notifications/subscriptions/" + vals[suburl] + '/',
             data: inp.join('&')
           })
         )
@@ -1285,7 +1279,6 @@ function format_visual_vote_clear() {//{{{
 
 function format_instance_pos() { //{{{
   $(save['instance_pos']).each(function(){
-    console.log(this);
     var taskname = this.nodeName;
     var taskstate = this.textContent;
     format_visual_add(taskname,save['state'] == 'running' ? (taskstate == 'at' ? 'active' : 'passive') : 'passive');
@@ -1378,6 +1371,113 @@ function append_to_log(what,type,message) {//{{{
   }
 }//}}}
 
+async function modifiers_display() {
+  let promises = [];
+  let rep = $('body').attr('current-resources');
+  $('#modifiers > div').remove();
+
+  promises.push(
+    $.ajax({
+      url: rep + 'modifiers/'
+    }).then(async function(res) {
+      let ipromises = [];
+      $('resource',res).each(function(_,r) {
+        ipromises.push(
+          $.ajax({
+            url: rep + 'modifiers/' + $(r).text()
+          }).then(async function(ses){
+            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));
+
+            let cpromises = [];
+            $('resource',ses).each(function(_,s) {
+              let opt = $('<option/>');
+              opt.text(decodeURIComponent($(s).text()));
+              $('div.select select',clone).append(opt);
+
+              cpromises.push(
+                $.ajax({
+                  url: rep + 'modifiers/' + $(r).text() + '/' + $(s).text() + '/condition.json'
+                }).then(function(tes){
+                  save['modifiers'][$(r).text() + '/' + $(s).text()] = tes;
+                })
+              );
+
+            });
+            $(clone).insertBefore($('#modifiers template'));
+
+            await Promise.all(cpromises);
+          })
+        );
+      });
+      await Promise.all(ipromises);
+    })
+  );
+  await Promise.all(promises);
+}
+
+function modifiers_select(e) {
+  let atts = {}
+  let attr = save['attributes'].save();
+  $('> attributes > *',attr).each(function(_,s){
+    atts[s.nodeName] = $(s).text();
+  });
+  $('#modifiers div[data-resource]').each(function(_,r){
+    $('select option',r).each(function(_,s){
+      let where = $(r).attr('data-resource') + '/' + encodeURIComponent($(s).text());
+      let cond = save['modifiers'][where];
+      let success = true;
+      for (x in cond) {
+        if (cond[x] != atts[x]) { success = false; }
+      }
+      if (success) {
+        save['modifiers_active'][$(r).attr('data-resource')] = $(s).text();
+        $('select',r).val($(s).text());
+      }
+    });
+  });
+}
+
+function modifiers_update_patch(url,now) {
+  $.ajax({
+    url: url + '/' + now + '/patch.xml',
+    success: function(res) {
+      set_testset(res,false);
+    }
+  });
+}
+function modifiers_update_unpatch(url,last,now) {
+  $.ajax({
+    url: url + '/' + last + '/unpatch.xml',
+    success: function(res) {
+      set_testset(res,false).then(function() {
+        modifiers_update_patch(url,now);
+      });
+    },
+    error: function() {
+      modifiers_update_patch(url,now);
+    }
+  });
+}
+
+function modifiers_update(e) {
+  // when change path
+  // unpach from what changed
+  // show ui
+  let rep = $('body').attr('current-resources');
+  let top = $(e.target).parents('div[data-resource]').attr('data-resource');
+  let last = save['modifiers_active'][top];
+  let now = $(e.target).val();
+
+  if (last) {
+    modifiers_update_unpatch(rep + 'modifiers/' + top,last,now);
+  } else {
+    modifiers_update_patch(rep + 'modifiers/' + top,now);
+  }
+}
+
 function report_failure(){}
 
 function ui_pos(e,bl) {

data/cockpit/model.html

@@ -151,14 +151,6 @@
               <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save SVG</button>
             </div>
           </div>
-          <div class='section'>
-            <div>
-              Current model: <span id='currentmodel'></span>
-            </div>
-            <div>
-              <button title='a testset includes various settings, subscriptions and a model' name="loadmodeltype">set model type</button>
-            </div>
-          </div>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="dataelements" id="areadataelements" class="inactive"> <!--{{{-->
           <button title='add entry'><span>New</span></button>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.5"
+  s.version          = "2.1.6"
   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

@@ -1 +1 @@
-431893
+742413

data/server/routing/forward-events.pid

@@ -1 +1 @@
-431878
+742401

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-431885
+742405

data/server/routing/persist.pid

@@ -1 +1 @@
-431889
+742409

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl