cpee 1.4.28 → 1.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb0566c97a5e94d22d7514cec30e8aedb3a1f869a58f9db36e2101395bb23f35
-  data.tar.gz: 76766b11cfe15848f0c1b072f20c0fe5d8b5b33cb672d4bca97a525e7c497c6c
+  metadata.gz: 69167cf7972c5d782e186b52c9bc447b01ca491c3c711a483d6abf50249d9f46
+  data.tar.gz: e8354ec5bdd70105d979acf467de51d3368b050add7e86e3e6bf848c789bb89e
 SHA512:
-  metadata.gz: b7803a310214036f8381239be726703c80afa69757b278dfac2e17eac42d2f00e6c094407549c3bbd0ae206a8422dcf96924125bb3e0bffc493a8f113d102a46
-  data.tar.gz: 4748f4903496f66c666f6ed2b2d01834ad1bbf0f11fbbf8ce3f9533fb94c9b995d76220cadc5f5d4c618a85b3c53ce551024daed8f9b3234c0ecded0c67d8a12
+  metadata.gz: 046a33c964cccb7ea6ec83b52abcc2ac9ae44b648c9a45ebf0b8922666493b001df6a6191b0c4cee00720e837cf14d6b171104362aa517223bac393dff4a6079
+  data.tar.gz: d4ff60f1b32c7df91303848dac2dc410f02f672dd3c4ee4c7459d82a40cb6b74c7b6a8e5fdfa0b00f0670ec545c8682fdfe62000f49e5b87ee9dd7dd6658f6ea

data/cockpit/css/track.css

@@ -0,0 +1,41 @@
+#trackfull {
+  display: flex;
+  flex-direction:row;
+  align-items: stretch;
+  height: 100vh;
+}
+#graphcolumn {
+  flex: 0 0 auto;
+  overflow: auto;
+  min-width: 35em;
+  border-right: 0 none;
+}
+#trackcolumn {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction:column;
+  align-items: stretch;
+}
+
+#trackcolumn iframe {
+  flex: 1 1 auto;
+  border: 0 none;
+  padding: 0;
+  margin: 0;
+  border-left: 0.1em solid var(--x-ui-border-color);
+  border-bottom: 0.1em solid var(--x-ui-border-color);
+}
+
+#usage {
+  line-height: 2em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+#usage button{
+  width: 2em;
+  height: 2em;
+  vertical-align: center;
+}
+#current-instance[href]:after {
+  content: "";
+}

data/cockpit/css/ui.css

@@ -14,7 +14,7 @@ body {
 #areanew input                 {
   width: 100%;
   padding: 0.1em 0.5em;
-  border: 0.1em solid #a1a1a1;
+  border: 0.1em solid var(--x-ui-border-color);
   border-radius: 0;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -49,9 +49,9 @@ ui-tabbed ui-tabbar ui-behind button {
 
 #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 #a1a1a1;      padding: 0 0.5em;     white-space: nowrap; }
-#areainstance div.section:nth-child(3) { border-left: 1px solid #a1a1a1;      padding: 0 0 0 0.5em; white-space: nowrap; }
+#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:nth-child(1) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
 #areainstance div.section:nth-child(1) button                       { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
@@ -71,7 +71,7 @@ ui-tabbed ui-tabbar ui-behind button {
 #areaexecution table.x-ui-compact tbody.debug tr:last-child td { padding-bottom: 0.5em; }
 #areaexecution table.x-ui-compact tbody.debug tr:last-child td input { vertical-align: middle; }
 #areaexecution table.x-ui-compact tbody.exe tr:first-child td { padding-top: 0.5em; }
-#areaexecution table.x-ui-compact tbody.exe { border-top: 1px solid #a1a1a1; }
+#areaexecution table.x-ui-compact tbody.exe { border-top: 1px solid var(--x-ui-border-color); }
 
 #areaexecution table.x-ui-compact tbody.exe td { height: 2.2em; }
 
@@ -125,7 +125,7 @@ span.vote {
 #graphcolumn {
   margin: 0;
   padding: 0;
-  border-right: 1px solid #a1a1a1;
+  border-right: 1px solid var(--x-ui-border-color);
   min-width: 9em;
 }
 #detailcolumn {

data/cockpit/js/instance.js

@@ -35,6 +35,8 @@ var sub_more = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'attributes' + '&' +
                'events' + '=' + 'change' + '&' +
+               'topic'  + '=' + 'task' + '&' +
+               'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'handlerwrapper' + '&' +
@@ -55,6 +57,8 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'attributes' + '&' +
                'events' + '=' + 'change' + '&' +
+               'topic'  + '=' + 'task' + '&' +
+               'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'handlerwrapper' + '&' +
@@ -90,7 +94,7 @@ function cockpit() { //{{{
       }
       if (q.monitor && q.load) {
         if (q.load.match(/https?:\/\//)) {
-          $("#predefinedtestsets").attr('data-other',q.load);
+          $('body').attr('load-testset',q.load);
         } else {
           $("#predefinedtestsets div.menuitem").each(function(k,v){
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
@@ -100,7 +104,7 @@ function cockpit() { //{{{
         monitor_instance(q.monitor,$("body").attr('current-repo'),true,false);
       } else if (q.load) {
         if (q.load.match(/https?:\/\//)) {
-          $("#predefinedtestsets").attr('data-other',q.load);
+          $('body').attr('load-testset',q.load);
         } else {
           $("#predefinedtestsets div.menuitem").each(function(k,v){
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
@@ -116,7 +120,7 @@ function cockpit() { //{{{
         monitor_instance(q.monitor,$("body").attr('current-repo'),false,false);
       } else if (q.exec) {
         if (q.exec.match(/https?:\/\//)) {
-          $("#predefinedtestsets").attr('data-other',q.load);
+          $('body').attr('load-testset',q.load);
         } else {
           $("#predefinedtestsets div.menuitem").each(function(k,v){
             if ($(v).text() == q.exec) { $(v).attr('data-selected','selected'); }
@@ -234,6 +238,12 @@ function websocket() { //{{{
             monitor_graph_change(true);
           }
           break;
+        case 'task':
+          if ($('#trackcolumn').length > 0) {
+            var details = JSON.parse($('event > notification',data).text());
+            $('#trackcolumn').append($('<iframe src="track.html?monitor=' + details.received['CPEE-INSTANCE-URL'].replace(/\/*$/,'/') + '"></iframe>'));
+          }
+          break;
         case 'state':
           monitor_instance_state_change(JSON.parse($('event > notification',data).text()).state);
           break;
@@ -372,7 +382,9 @@ function monitor_instance_values(val) {// {{{
           });
         });
       } else if(val == "attributes") {
-        document.title = $(" > value > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
+        var text = $(" > value > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
+        $('#title').text(text);
+        document.title = text;
       }
     }
   });
@@ -515,9 +527,15 @@ function monitor_instance_running(notification,event) {// {{{
     format_visual_remove(parts.activity,"active")
 } // }}}
 function monitor_instance_state_change(notification) { //{{{
+  if ($('#trackcolumn').length > 0) {
+    if (notification == "finished") {
+      parent.closeIFrame(window.location.search);
+    }
+  }
   if (notification == "ready" || notification == "stopped" || notification == "running") {
     $("#state button").removeAttr('disabled');
   }
+
   // sometimes, out of sheer network routingness, stopping comes after stopped, which fucks the UI hard
   // thus, we are having none of it
   if (notification == 'stopping' && save['state'] == 'stopped')
@@ -537,9 +555,9 @@ function monitor_instance_state_change(notification) { //{{{
 
     var but = "";
     if (notification == "ready" || notification == "stopped") {
-      but = " ⇒ <button onclick='$(this).attr(\"disabled\",\"disabled\");start_instance();'>start</button> / <button onclick='$(this).attr(\"disabled\",\"disabled\");sim_instance();'>simulate</button> / <button onclick='aba_instance();'>abandon</button>";
+      but = " ⇒ <button onclick='$(this).attr(\"disabled\",\"disabled\");start_instance();' title='start'>⏵</button> / <button onclick='$(this).attr(\"disabled\",\"disabled\");sim_instance();' title='simulate'>🎜</button> / <button onclick='aba_instance();' title='abandon'>⛌</button>";
     } else if (notification == "running") {
-      but = " ⇒ <button onclick='$(this).attr(\"disabled\",\"disabled\");stop_instance();'>stop</button>";
+      but = " ⇒ <button onclick='$(this).attr(\"disabled\",\"disabled\");stop_instance();' title='stop'>⏸</button>";
     }
 
     // disable all input, also check themes
@@ -710,7 +728,7 @@ function save_svg() {// {{{
         if (x && x.href && x.href.match(/wfadaptor\.css$/)) {
           $(x.cssRules).each(function(j,y){
             var loc = $(gc).find(y.selectorText.replace(/^svg /,''));
-            loc.attr('style',y.style.cssText);
+            loc.attr('style',y.style.cssText + loc.attr('style') + ';');
           });
           var loc = $(gc).find('text.super');
           loc.attr('style',loc.attr('style') + ' display: none');
@@ -854,7 +872,9 @@ function load_testset(exec) {// {{{
   if (name) {
     url = $('body').attr('current-testsets') + name + ".xml";
   } else {
-    url = $("#predefinedtestsets").attr('data-other');
+    if ($('body').attr('load-testset').length > 0) {
+      url = $('body').attr('load-testset');
+    }
   }
   if (url) {
     $.ajax({

data/cockpit/js/track.js

@@ -0,0 +1,8 @@
+function closeIFrame(srch) {
+  $('iframe').each(function(i,val){
+    if ($(val).attr('src') == 'track.html' + srch) {
+      $(val).remove();
+    }
+  });
+}
+

data/cockpit/track.html

@@ -44,75 +44,30 @@
     <link   rel="stylesheet"      href="/js_libs/ui.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
-    <script>
-      var lines;
-      var ws;
-      var acts = {};
-      var transitions = [];
-      var lastpos;
 
-      var sub = 'topic'  + '=' + 'activity' + '&' +// {{{
-                'events' + '=' + 'receiving';// }}}
+    <!-- modelling ui -->
+    <script type="text/javascript" src="js/wfadaptor.js"></script>
+    <link rel="stylesheet" href="css/wfadaptor.css" type="text/css"/>
 
-      function websocket(what) { //{{{
-        var url = $('body').attr('current-instance');
-        var Socket = "MozWebSocket" in window ? MozWebSocket : WebSocket;
-        if (ws) ws.close();
-        ws = new Socket(url.replace(/http/,'ws') + "/notifications/subscriptions/" + what + "/ws/");
-        ws.onopen = function() {
-          console.log("monitoring", "opened", "");
-        };
-        ws.onmessage = function(e) {
-          data = $.parseXML(e.data);
-          if ($('event > topic',data).length > 0) {
-            switch($('event > topic',data).text()) {
-              case 'activity':
-                var data = JSON.parse($('event > notification',data).text());
-                if (data.endpoint == "https://centurio.work/flow/start/url/") {
-                  var num = parseInt(data.received[0].data.match(/\d+$/)[0]);
-                  console.log(num);
-                  $('#bla1').attr('src','https://centurio.work/flow/graph.html?monitor=' + data.received[0].data);
-                  setTimeout(function(){ $('#bla2').attr('src','https://centurio.work/flow/graph.html?monitor=' + data.received[0].data.replace(/\d+$/,num+1)); }, 2000);
-                  setTimeout(function(){ $('#bla3').attr('src','https://centurio.work/flow/graph.html?monitor=' + data.received[0].data.replace(/\d+$/,num+2)); }, 4000);
-                }
-                break;
-            }
-          }
-          if ($('vote > topic',data).length > 0) {
-          }
-        };
-        ws.onclose = function() {
-          console.log("monitoring", "closed", "server down i assume.");
-        };
-      } //}}}
-
-      $(document).ready(function(){
-        var url = "https://centurio.work/flow/engine/11/";
-        $('body').attr('current-instance',url);
-        $.ajax({
-          type: "POST",
-          url: url + "/notifications/subscriptions/",
-          data: sub,
-          success: function(res){
-            res = res.unserialize();
-            $.each(res,function(a,b){
-              if (b[0] == 'key') {
-                websocket(b[1]);
-              }
-            });
-          }
-        });
-      });
-    </script>
+    <!-- custom stuff, play arround  -->
+    <script type="text/javascript" src="js/ui.js"></script>
+    <script type="text/javascript" src="js/instance.js"></script>
+    <script type="text/javascript" src="js/details.js"></script>
+    <script type="text/javascript" src="js/parameters.js"></script>
+    <script type="text/javascript" src="js/track.js"></script>
+    <link rel="stylesheet" href="css/ui.css" type="text/css"/>
+    <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" style="display: flex; flex-direction:row; align-items: stretch; height: 100vh;">
-     <div style="flex: 1 1 auto; display: flex; flex-direction:column; align-items: stretch; height: 100vh">
-       <iframe style="flex: 1 1 auto;" src="graph.html?monitor=https://centurio.work/flow/engine/11/"></iframe>
-       <iframe id="bla1" style="flex: 1 1 auto;" src=""></iframe>
-     </div>
-     <div style="flex: 1 1 auto; display: flex; flex-direction:column; align-items: stretch; height: 100vh">
-       <iframe id="bla2" style="flex: 1 1 auto;" src=""></iframe>
-       <iframe id="bla3" style="flex: 1 1 auto;" src=""></iframe>
-     </div>
+  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
+    <div id="trackfull">
+      <div id='graphcolumn'>
+        <div id="usage">
+          <span id="title"></span> | <span id='state'></span>
+        </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 id='trackcolumn'>
+      </div>
+    </div>
   </body>
 </html>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.28"
+  s.version          = "1.4.29"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.4.28
+  version: 1.4.29
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -118,6 +118,7 @@ files:
 - cockpit/contrib/transformation1.xsl
 - cockpit/contrib/transformation2.xsl
 - cockpit/contrib/tree_example.svg
+- cockpit/css/track.css
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
 - cockpit/graph.html
@@ -125,6 +126,7 @@ files:
 - cockpit/js/details.js
 - cockpit/js/instance.js
 - cockpit/js/parameters.js
+- cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
 - cockpit/js_libs.zip