cpee 2.0.9 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 811f6ba4e6ef11aa5de45fb30c400e05b061413912dfe2395d3e49f54e1bb0e8
-  data.tar.gz: 18d970c9e70317eb063d60e35fb9df8714e1692f5b374a3b1ad9fa7ba8750993
+  metadata.gz: ec2d0a3e32433094917a00ceb63a0b31bf58f3d7cc0596a3578ea559c62f7d19
+  data.tar.gz: e3c0b6196e91ce7453e29e280cc694dee44d2fa004b9a4734742d43558bd4944
 SHA512:
-  metadata.gz: 151b7914bc3823b202df188d8f444a76bfcd1fa175e6fde33dbb4e0b33cddfe094bf72929f9b9b460523a50195fe573b610a38b1b4e9a87cb8c2e0bb6efb44d1
-  data.tar.gz: 8cec770c49dcbdd614bde9d4d5c5aa788d24660d5ca1ed09af87957abd320512313dbe2b0afae14646ebf316695be4094ca902ed0da64385eb78c5aaaf3c9dfb
+  metadata.gz: 8bd50b009072a41ae75dd650ddbd777802250baf2a667a212c0a79971a837018d9abccb555363c9708c0c1eea2133fba888958ff5b77631b4b9f76ea76288864
+  data.tar.gz: af9862cf80d23a3653043e5a5b7ebd5015a64f825e521cf9ae57703d1995e5119691f8e85fbeb9444ee5fc9928d72a797b927fc0ba46e900669ff3e0a39a6d0c

data/cockpit/config.json

@@ -0,0 +1,3 @@
+{
+  "res-url": "https://cpee.org/flow/resources/"
+}

data/cockpit/css/track.css

@@ -5,11 +5,16 @@
   height: 100vh;
 }
 #graphcolumn {
-  flex: 0 0 auto;
-  overflow: auto;
-  min-width: 35em;
+  flex: 0 1 auto;
+  width: 35em;
+  min-width: 15em;
   border-right: 0 none;
+  overflow: auto;
+}
+#graphcolumn.resize {
+  resize: horizontal;
 }
+
 #trackcolumn {
   flex: 1 1 auto;
   display: flex;
@@ -24,19 +29,25 @@
   margin: 0;
   border-left: 0.1em solid var(--x-ui-border-color);
   border-bottom: 0.1em solid var(--x-ui-border-color);
+  overflow: scroll;
 }
 
-#usage {
+#trackusage {
   line-height: 2em;
   margin-top: 0.5em;
   margin-left: 2em;
   margin-right: 1em;
 }
-#usage button{
+#trackusage button {
   width: 2em;
   height: 2em;
-  vertical-align: center;
+  vertical-align: middle;
 }
 #current-instance[href]:after {
   content: "";
 }
+
+#tracktitle {
+  white-space: nowrap;
+  margin-bottom: 0.1em;
+}

data/cockpit/css/ui.css

@@ -66,8 +66,6 @@ body {
   font: normal normal normal 14px/1 FontAwesome;
   font-size: 0.8em;
   text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
 	content: ' ';
 }
 #graphgrid .graphlabel.selected a::after, graphgrid .graphlabel.hover a::after {
@@ -104,6 +102,12 @@ ui-tabbed ui-tabbar ui-behind button {
 #current-instance-subscriptions[href]:after {
   content: "|";
 }
+#current-graph[href]:before {
+  content: "|";
+}
+#current-log[href]:before {
+  content: "|";
+}
 
 #parameters ui-content { height: 8.5em; min-height: 1.7em; }
 

data/cockpit/css/wfadaptor.css

@@ -338,7 +338,7 @@ svg text.label {
   text-align:center;
   line-height:125%;
   writing-mode:horizontal-tb;
-  text-anchor:left;
+  text-anchor:start;
   color: var(--wfadaptor-base);
   fill: var(--wfadaptor-base);
   fill-opacity:1;

data/cockpit/edit.html

@@ -0,0 +1 @@
+cockpit/index.html

data/cockpit/index.html

@@ -121,7 +121,7 @@
         <ui-tab class=""                data-tab="new"       id="tabnew"      >New</ui-tab>
         <ui-tab class="inactive hidden" data-tab="instance"  id="tabinstance" >Instance</ui-tab>
         <ui-tab class="inactive hidden" data-tab="execution" id="tabexecution">Execution</ui-tab>
-        <ui-behind                                                            ><a id='current-instance'></a><a id='current-instance-properties'></a><a id='current-instance-subscriptions'></a><a id='current-instance-callbacks'></a></ui-behind>
+        <ui-behind                                                            ><a style='display:none' target='_blank' id='current-instance'></a><a style='display:none' target='_blank' id='current-instance-properties'>P</a><a style='display:none' target='_blank' id='current-instance-subscriptions'>S</a><a style='display:none' target='_blank' id='current-instance-callbacks'>C</a></ui-behind>
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="new" id="areanew"> <!--{{{-->
@@ -234,7 +234,7 @@
         <ui-tab class=""         data-tab="details" id="tabdetails">Graph</ui-tab>
         <ui-tab class="inactive" data-tab="dsl"     id="tabdsl"    >Description</ui-tab>
         <ui-tab class="inactive" data-tab="log"     id="tablog"    >Log</ui-tab>
-        <ui-behind                                                 ></ui-behind>
+        <ui-behind                                                 ><a style='display:none' target='_blank' id='current-track'>T</a><a style='display:none' target='_blank' id='current-graph'>G</a><a style='display:none' target='_blank' id='current-log'>L</a></ui-behind>
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="details" id='graphcolumn'>

data/cockpit/js/instance.js

@@ -251,56 +251,60 @@ function create_instance(base,name,load,exec) {// {{{
 
 function sse() { //{{{
   var url = $('body').attr('current-instance');
-  es = new EventSource(url + "/notifications/subscriptions/" + subscription + "/sse/");
-  es.onopen = function() {
-    append_to_log("monitoring", "opened", "");
-  };
-  es.onmessage = function(e) {
-    data = JSON.parse(e.data);
-    if (data['type'] == 'event') {
-      switch(data['topic']) {
-        case 'dataelements':
-          monitor_instance_values("dataelements");
-          break;
-        case 'description':
-          monitor_instance_dsl();
-          break;
-        case 'endpoints':
-          monitor_instance_values("endpoints");
-          break;
-        case 'attributes':
-          monitor_instance_values("attributes");
-          monitor_instance_transformation();
-          if (!suspended_monitoring) { // or else it would load twice, because dsl changes also trigger
-            monitor_graph_change(true);
-          }
-          break;
-        case 'task':
-          if ($('#trackcolumn').length > 0) {
-            $('#trackcolumn').append($('<iframe src="track.html?monitor=' + data.content.received['CPEE-INSTANCE-URL'].replace(/\/*$/,'/') + '"></iframe>'));
-          }
-          break;
-        case 'state':
-          monitor_instance_state_change(data['content']['state']);
-          break;
-        case 'position':
-          monitor_instance_pos_change(data['content']);
-          break;
-        case 'activity':
-          monitor_instance_running(data['content'],data['name']);
-          break;
+  if (subscription) {
+    es = new EventSource(url + "/notifications/subscriptions/" + subscription + "/sse/");
+    es.onopen = function() {
+      append_to_log("monitoring", "opened", "nice.");
+    };
+    es.onmessage = function(e) {
+      data = JSON.parse(e.data);
+      if (data['type'] == 'event') {
+        switch(data['topic']) {
+          case 'dataelements':
+            monitor_instance_values("dataelements");
+            break;
+          case 'description':
+            monitor_instance_dsl();
+            break;
+          case 'endpoints':
+            monitor_instance_values("endpoints");
+            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);
+              }
+            }
+            break;
+          case 'task':
+            if ($('#trackcolumn').length > 0) {
+              $('#trackcolumn').append($('<iframe src="track.html?monitor=' + data.content.received['CPEE-INSTANCE-URL'].replace(/\/*$/,'/') + '"></iframe>'));
+              $('#graphcolumn').addClass('resize');
+            }
+            break;
+          case 'state':
+            monitor_instance_state_change(data['content']['state']);
+            break;
+          case 'position':
+            monitor_instance_pos_change(data['content']);
+            break;
+          case 'activity':
+            monitor_instance_running(data['content'],data['name']);
+            break;
+        }
       }
-    }
-    if (data['type'] == 'vote') {
-      monitor_instance_vote_add(data['content']);
-    }
-    append_to_log(data['type'], data['topic'] + '/' + data['name'], JSON.stringify(data['content']));
-  };
-  es.onerror = function() {
-    append_to_log("monitoring", "closed", "server down i assume.");
-    // setTimeout(sse,10000);
-  };
-
+      if (data['type'] == 'vote') {
+        monitor_instance_vote_add(data['content']);
+      }
+      append_to_log(data['type'], data['topic'] + '/' + data['name'], JSON.stringify(data['content']));
+    };
+    es.onerror = function() {
+      append_to_log("monitoring", "closed", "finished or abandoned or not existing or server down. one of these, i assume.");
+      // setTimeout(sse,10000);
+    };
+  }
   monitor_instance_values("dataelements");
   monitor_instance_values("endpoints");
   monitor_instance_values("attributes");
@@ -334,14 +338,25 @@ function monitor_instance(cin,rep,load,exec) {// {{{
       $("ui-tabbed ui-tab.hidden, ui-rest ui-tab.hidden").removeClass("hidden");
 
       // Change url to return to current instance when reloading
-      $("#current-instance").text(url);
+      $("#current-instance").show();
+      $("#current-instance").text(url.match(/(\d+)\/?$/)[1]);
       $("#current-instance").attr('href',url);
+      $("#current-instance-properties").show();
       $("#current-instance-properties").attr('href',url + 'properties/');
-      $("#current-instance-properties").text('P');
+      $("#current-instance-subscriptions").show();
       $("#current-instance-subscriptions").attr('href',url + 'notifications/subscriptions/');
-      $("#current-instance-subscriptions").text('S');
+      $("#current-instance-callbacks").show();
       $("#current-instance-callbacks").attr('href',url + 'callbacks/');
-      $("#current-instance-callbacks").text('C');
+      $("#current-monitor").show();
+      $("#current-monitor").attr('href','edit.html?monitor=' + url);
+      $("#current-graph").show();
+      $("#current-graph").attr('href','graph.html?monitor=' + url);
+      $("#current-track").show();
+      $("#current-track").attr('href','track.html?monitor=' + url);
+      if ($('body').attr('current-logs')) {
+        $("#current-log").show();
+        $("#current-log").attr('href','edit.html?monitor=' + url);
+      }
       var q = $.parseQuerySimple();
       history.replaceState({}, '', '?' + (q.min || q.min=="" ? "min&" : "") + 'monitor='+url);
 
@@ -359,6 +374,11 @@ function monitor_instance(cin,rep,load,exec) {// {{{
           if (load || exec) {
             load_testset(exec);
           }
+        },
+        error: function() {
+          subscription = undefined;
+          append_to_log("monitoring", "closed", "For Good.");
+          sse();
         }
       });
     },
@@ -541,6 +561,7 @@ function adaptor_init(url,theme,dslx) { //{{{
       format_instance_pos();
     });
   }
+  suspended_monitoring = false;
 } //}}}
 
 function monitor_graph_change(force) { //{{{
@@ -644,7 +665,7 @@ function monitor_instance_running(content,event) {// {{{
 } // }}}
 function monitor_instance_state_change(notification) { //{{{
   if ($('#trackcolumn').length > 0) {
-    if (notification == "finished") {
+    if (notification == "finished" || notification == "abandoned") {
       parent.closeIFrame(window.location.search);
     }
   }
@@ -915,7 +936,6 @@ async function set_testset(testset,exec) {// {{{
   );
 
   await Promise.all(promises);
-  suspended_monitoring = false;
 
   $.ajax({
     type: "GET",

data/cockpit/js/track.js

@@ -1,8 +1,18 @@
 function closeIFrame(srch) {
+  var count = 0;
   $('iframe').each(function(i,val){
     if ($(val).attr('src') == 'track.html' + srch) {
       $(val).remove();
     }
+    count += 1;
   });
+  if (count == 1) {
+    $('#graphcolumn').removeClass('resize');
+  }
 }
 
+$(document).ready(function() {
+  $("a[name=glob_unshow]").click(e => {
+    parent.closeIFrame(window.location.search);
+  });
+});

data/cockpit/js/ui.js

@@ -1,3 +1,19 @@
+function config_defaults(){
+  var default_values = {};
+  // logs is missing, so that the button is not shown, when there is no info
+  if (location.protocol.match(/^file/)) {
+    default_values['res-url']  = 'http://localhost:' + $('body').data('res-port');
+    default_values['base-url'] = 'http://localhost:' + $('body').data('base-port');
+    default_values['save-url'] = 'http://localhost:' + $('body').data('base-port') + '/design';
+  } else {
+    default_values['res-url']  = location.protocol + "//" + location.hostname + ":" + $('body').data('res-port');
+    default_values['base-url'] = location.protocol + "//" + location.hostname + ":" + $('body').data('base-port');
+    default_values['save-url'] = location.protocol + "//" + location.hostname + ":" + $('body').data('base-port') + '/design';
+  }
+  default_values['templates-url'] = 'templates/';
+  return default_values;
+}
+
 $(document).ready(function() {
   if (!($.cookie('cpee_iagree')) && $("body > div[id='disclaimer']").length > 0) {
     $("body > :not([id='disclaimer'])").remove();
@@ -18,25 +34,40 @@ $(document).ready(function() {
     $.ajax({
       url: "config.json",
       success: function(res){
-        $("input[name=res-url]").val(res['res-url']);
-        $("input[name=base-url]").val(res['base-url']);
-        $("body").attr('current-resources',res['res-url']);
-        $("body").attr('current-base',res['base-url']);
-        $("body").attr('current-save',res['save-url']);
-        $("body").attr('current-templates',res['testsets-url']);
+        var res_def = config_defaults();
+        if (res['log-url']) { // just leave it out when it is not configured
+          $("body").attr('current-logs',res['log-url']);
+        }
+        if (res['res-url']) {
+          $("body").attr('current-resources',res['res-url']);
+        } else {
+          $("body").attr('current-resources',res_def['res-url']);
+        }
+        if (res['base-url']) {
+          $("body").attr('current-base',res['base-url']);
+        } else {
+          $("body").attr('current-base',res_def['base-url']);
+        }
+        if (res['save-url']) {
+          $("body").attr('current-save',res['save-url']);
+        } else {
+          $("body").attr('current-save',res_def['save-url']);
+        }
+        if (res['testsets-url']) {
+          $("body").attr('current-templates',res['templates-url']);
+        } else {
+          $("body").attr('current-templates',res_def['templates-url']);
+        }
+        $("input[name=res-url]").val($("body").attr('current-resources'));
+        $("input[name=base-url]").val($("body").attr('current-base'));
         cockpit();
       },
       error: function(){
-        $("body").attr('current-templates','templates/');
-        if (location.protocol.match(/^file/)) {
-          $("body").attr('current-resources',"http://localhost:" + $('body').data('res-port'));
-          $("body").attr('current-base',"http://localhost:" + $('body').data('base-port'));
-          $("body").attr('current-save',"http://localhost:" + $('body').data('base-port') + '/design');
-        } else {
-          $("body").attr('current-resources',location.protocol + "//" + location.hostname + ":" + $('body').data('res-port'));
-          $("body").attr('current-base',location.protocol + "//" + location.hostname + ":" + $('body').data('base-port'));
-          $("body").attr('current-save',location.protocol + "//" + location.hostname + ":" + $('body').data('base-port') + '/design');
-        }
+        var res = config_defaults();
+        $("body").attr('current-resources',res['res-url']);
+        $("body").attr('current-base',res['base-url']);
+        $("body").attr('current-save',res['save-url']);
+        $("body").attr('current-templates',res['templates-url']);
         $("input[name=res-url]").val($("body").attr('current-resources'));
         $("input[name=base-url]").val($("body").attr('current-base'));
         cockpit();

data/cockpit/templates/Track Test Local.xml

@@ -0,0 +1,82 @@
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <dataelements>
+    <i>0</i>
+  </dataelements>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <start_url>http://localhost:9296/url/</start_url>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <loop mode="pre_test" condition="true">
+        <parallel wait="-1">
+          <loop mode="pre_test" condition="data.i &lt; 4">
+            <_probability>
+              <_probability_min/>
+              <_probability_max/>
+              <_probability_avg/>
+            </_probability>
+            <parallel_branch pass="" local="">
+              <call id="a1" endpoint="start_url">
+                <parameters>
+                  <label>Start</label>
+                  <method>:post</method>
+                  <arguments>
+                    <behavior>wait_running</behavior>
+                    <url>http://localhost/flow/templates/instantiate.local/Take_Sub.xml</url>
+                    <init>
+                      <time>4</time>
+                    </init>
+                    <endpoints/>
+                    <stream/>
+                  </arguments>
+                  <stream>
+                    <sensors/>
+                    <aggregators/>
+                    <costs/>
+                  </stream>
+                  <report>
+                    <url/>
+                  </report>
+                </parameters>
+                <annotations>
+                  <_timing>
+                    <_timing_wait/>
+                    <_timing_threshold/>
+                    <_timing_min/>
+                    <_timing_max/>
+                    <_timing_avg/>
+                  </_timing>
+                  <_notes>
+                    <_notes_general/>
+                  </_notes>
+                </annotations>
+              </call>
+            </parallel_branch>
+            <manipulate id="a4" label="">data.i += 1</manipulate>
+          </loop>
+        </parallel>
+        <manipulate id="a3" label="">data.i = 0</manipulate>
+        <_probability>
+          <_probability_min/>
+          <_probability_max/>
+          <_probability_avg/>
+        </_probability>
+        <stop id="a2"/>
+      </loop>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info>Track Test</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+  </attributes>
+</testset>