cpee 1.4.31 → 1.4.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e48011aec4db8af5bc2b79dd87481695b733dbdffb0b171e8fb6281af4de1c9
-  data.tar.gz: e686360f51c1b0f6c72446182b0e9bb9bb572a7cc57877bcb4dbb8c92201ce28
+  metadata.gz: cc0378a344f36f63688176739300a794d7382bd0b64328f77268a86d7793b600
+  data.tar.gz: dc7386cf36ec7fa429869d574f0fcf00100e7f6e557a40659ffad85d14578059
 SHA512:
-  metadata.gz: eb4e1ca4c4f3cc2ae1720d189aaca4a6daa3caa2021e89a3e46c6c59c14721e7b02a604e075b4c751708e1644789cc09ee1b2035014e7832f12cd8f0086c0ff7
-  data.tar.gz: 38310d626cd1f1adacc706938621e34aa1da45d846a4852da008c96b8e2d86d5aa1de12b47c9fe30fc1f2ecff03f22ac35632b75a52181d0ec5ed13af56239ad
+  metadata.gz: 9752ddc5b88787159245f8cf00fc4ac5bde112bae2bd663d6f2c0ce79fd92e2298e83acc28a806a5828560fbcedb71b16b2e4ff9ddf22666cc02d49104cafd71
+  data.tar.gz: cc8b6d31edf48155691537d23ecb959ef86c98d8cdbe0ae94361d81f9b5d1fbc14eedbda84215372ef8422c38c02a2cc7410b91bc08e87da24c827b633d47e4b

data/cockpit/css/ui.css

@@ -10,25 +10,44 @@ body {
 #graphgrid {
   display: grid;
   grid-gap: 0;
-  grid-template-columns: max-content repeat(100,min-content);
   width: 100%;
 }
 #graphcanvas {
   grid-column: 1;
 }
-.graphspacer {
-  grid-row: 1;
-  grid-column: 2;
+#graphgrid .graphlabel {
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+  display: flex;
+  flex-direction: row;
 }
-.graphlabel {
+#graphgrid .graphempty {
   padding-left: 0.5em;
   display: flex;
   flex-direction: row;
 }
-.graphlabel > span {
+#graphgrid .graphlast {
+  padding-left: 0.5em;
+  display: flex;
+  flex-direction: row;
+}
+#graphgrid.striped .graphlabel, #graphgrid.striped .graphempty {
+  border-left: 1pt solid var(--wfadaptor-border);
+}
+#graphgrid.striped .graphlabel.even, #graphgrid.striped .graphempty.even, #graphgrid.striped .graphlast.even {
+  background-color: #e9e9e9;
+}
+#graphgrid .graphlabel > span {
   align-self: center;
   white-space: nowrap;
 }
+#graphgrid .graphlabel.hover {
+  color: var(--wfadaptor-selected);
+  cursor: pointer;
+}
+#graphgrid .graphlabel.selected {
+  color: var(--wfadaptor-selected);
+}
 
 #instance ui-content { height: 7em; }
 

data/cockpit/css/wfadaptor.css

@@ -20,13 +20,15 @@
   --wfadaptor-exec-active-text: #cc0000;
   --wfadaptor-exec-vote: #8ae234;
   --wfadaptor-exec-vote-text: #73d216;
-  --wfadaptor-highlight: Highlight;
+  --wfadaptor-highlight: #0081c7;
   --wfadaptor-base: #000000;
   --wfadaptor-label: #d4d4d4;
   --wfadaptor-mark: #d4d4d4;
   --wfadaptor-selected: #f57900;
+  --wfadaptor-stripe: #e9e9e9;
   --wfadaptor-background: #ffffff;
   --wfadaptor-background-menu: #ff7f7f;
+  --wfadaptor-border: #a1a1a1;
 }
 
 svg {
@@ -44,6 +46,14 @@ svg g.passive .rfill {
   fill: var(--wfadaptor-exec-passive);
   fill-opacity:1;
 }
+
+svg rect.stripe.even {
+  fill: var(--wfadaptor-background);
+}
+svg rect.stripe.odd {
+  fill: var(--wfadaptor-stripe);
+}
+
 svg g.active .rfill {
   fill: var(--wfadaptor-exec-active);
   fill-opacity:1;
@@ -73,6 +83,7 @@ svg line.ourline, svg path.ourline {
   stroke-width: 2;
   fill: none;
 }
+
 svg rect.block {
   stroke-width: 1;
   stroke-dasharray: 3,5;
@@ -220,7 +231,6 @@ svg .standwithout {
 }
 svg .standtrans {
   fill: var(--wfadaptor-background);
-  fill-opacity:0;
 }
 svg text.normal {
   font-size:20px;
@@ -329,8 +339,8 @@ svg text.label {
   line-height:125%;
   writing-mode:horizontal-tb;
   text-anchor:left;
-  color: var(--wfadaptor-text);
-  fill: var(--wfadaptor-text);
+  color: var(--wfadaptor-base);
+  fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
   font-family:Arial;
@@ -342,12 +352,12 @@ svg text.label {
   fill: var(--wfadaptor-base);
 }
 
-svg g.element[element-id]:hover .hfill {
+svg g.element[element-id].hover .hfill {
   fill: var(--wfadaptor-selected);
   fill-opacity:1;
   cursor: pointer;
 }
-svg g.element[element-id]:hover .hline {
+svg g.element[element-id].hover .hline {
   fill: var(--wfadaptor-selected);
   fill-opacity:1;
   stroke: var(--wfadaptor-selected);
@@ -358,7 +368,7 @@ svg g.element[element-id]:hover .hline {
   stroke-dasharray:none;
   cursor: pointer;
 }
-svg g.element[element-id]:hover .htext {
+svg g.element[element-id].hover .htext {
   fill: var(--wfadaptor-selected);
   fill-opacity:1;
   stroke: var(--wfadaptor-selected);
@@ -370,11 +380,11 @@ svg g.element[element-id]:hover .htext {
   stroke-dasharray:none;
   cursor: pointer;
 }
-svg g.element[element-id]:hover > text.label {
+svg g.element[element-id].hover > text.label {
   color: var(--wfadaptor-selected);
   fill: var(--wfadaptor-selected);
 }
-svg g.element[element-id]:hover .cfill {
+svg g.element[element-id].hover .cfill {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke: var(--wfadaptor-base);
@@ -385,7 +395,7 @@ svg g.element[element-id]:hover .cfill {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
-svg g.element[element-id]:hover .cline {
+svg g.element[element-id].hover .cline {
   stroke: var(--wfadaptor-base);
   stroke-linecap:round;
   stroke-linejoin:round;

data/cockpit/graph.html

@@ -57,8 +57,13 @@
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
   </head>
   <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
-    <div id='graphcolumn' style='overflow: auto'>
-      <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 class='hidden' id='relaxngworker'></div>
+    <div id="trackfull">
+      <div id='graphcolumn'>
+        <div id='graphgrid'>
+          <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>
     </div>
   </body>
 </html>

data/cockpit/index.html

@@ -127,8 +127,8 @@
         <ui-area data-belongs-to-tab="new" id="areanew"> <!--{{{-->
           <table class='x-ui-layout'>
           <tr>
-            <td>Repository:</td>
-            <td><input name="repo-url" type="text" value=""/></td>
+            <td>Resources:</td>
+            <td><input name="res-url" type="text" value=""/></td>
             <td></td>
           </tr>
           <tr>
@@ -240,7 +240,6 @@
         <ui-area data-belongs-to-tab="details" id='graphcolumn'>
           <div id='graphgrid'>
             <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 class='graphspacer'></div>
           </div>
         </ui-area>
         <ui-resizehandle data-belongs-to-tab="details" data-label="drag to resize"></ui-resizehandle>

data/cockpit/js/details.js

@@ -59,6 +59,9 @@ function do_main_save() { //{{{
       if (vtarget.length > 0) {
         vtarget.parents('g.element[element-id]').addClass('selected');
       }
+      manifestation.adaptor.illustrator.get_label_by_svg_id(svgid).addClass('selected');
+
+
       var newnode = vtarget.parents('g.element[element-id]');
       var newtype = newnode.attr('element-type') + '_' + newnode.attr('element-endpoint');
       var g = graphrealization.get_description();

data/cockpit/js/instance.js

@@ -69,7 +69,7 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
 
 function cockpit() { //{{{
   $("button[name=base]").click(function(){ create_instance($("input[name=base-url]").val(),null,false,false); });
-  $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance($("input[name=instance-url]").val(),$("input[name=repo-url]").val(),false,false); });
+  $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance($("input[name=instance-url]").val(),$("input[name=res-url]").val(),false,false); });
   $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),function(){ load_testset(false) } ); });
   $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
@@ -106,7 +106,7 @@ function cockpit() { //{{{
           });
         }
         ui_activate_tab("#tabexecution");
-        monitor_instance(q.monitor,$("body").attr('current-repo'),true,false);
+        monitor_instance(q.monitor,$("body").attr('current-resources'),true,false);
       } else if (q.load) {
         if (q.load.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
@@ -122,7 +122,7 @@ function cockpit() { //{{{
         create_instance($("body").attr('current-base'),"Plain Instance",false,false);
       } else if (q.monitor) {
         ui_activate_tab("#tabexecution");
-        monitor_instance(q.monitor,$("body").attr('current-repo'),false,false);
+        monitor_instance(q.monitor,$("body").attr('current-resources'),false,false);
       } else if (q.exec) {
         if (q.exec.match(/https?:\/\//)) {
           $('body').attr('load-testset',q.load);
@@ -199,7 +199,7 @@ function create_instance(base,name,load,exec) {// {{{
         success: function(res){
           var iu = (base + "//" + res + "/").replace(/\/+/g,"/").replace(/:\//,"://");
           if (name) {
-            monitor_instance(iu,$("body").attr('current-repo'),load,exec);
+            monitor_instance(iu,$("body").attr('current-resources'),load,exec);
           } else {
             $("body").attr('current-instance', sanitize_url(iu));
             $("input[name=instance-url]").val(iu);
@@ -284,10 +284,10 @@ function websocket() { //{{{
 
 function monitor_instance(cin,rep,load,exec) {// {{{
   $("body").attr('current-instance',sanitize_url(cin));
-  $("body").attr('current-repo',    sanitize_url(rep));
+  $("body").attr('current-resources',sanitize_url(rep));
 
   $("input[name=instance-url]").val($("body").attr('current-instance'));
-  $("input[name=repo-url]").val($("body").attr('current-repo'));
+  $("input[name=res-url]").val($("body").attr('current-resources'));
 
   $('.tabbehind button').hide();
   $('#dat_details').empty();
@@ -345,7 +345,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
 
 function monitor_instance_values(val) {// {{{
   var url = $('body').attr('current-instance');
-  var rep = $('body').attr('current-repo');
+  var rep = $('body').attr('current-resources');
   var bas = $('body').attr('current-base');
 
   $.ajax({
@@ -362,7 +362,7 @@ function monitor_instance_values(val) {// {{{
             url: rep + encodeURIComponent($(v).text()),
             success: function() {
               tmp[v.tagName] = {};
-              var deferreds = [new $.Deferred(), new $.Deferred()];
+              var deferreds = [new $.Deferred(), new $.Deferred(), new $.Deferred()];
               $.ajax({
                 url: rep + encodeURIComponent($(v).text()) + "/symbol.svg",
                 success: function(res) {
@@ -379,6 +379,14 @@ function monitor_instance_values(val) {// {{{
                 },
                 error: deferreds[1].resolve
               })
+              $.ajax({
+                url: rep + encodeURIComponent($(v).text()) + "/properties.json",
+                success: function(res) {
+                  tmp[v.tagName]['properties'] = res;
+                  deferreds[2].resolve(true);
+                },
+                error: deferreds[2].resolve
+              })
               $.when.apply($, deferreds).then(function(x) {
                 save['endpoints_cache'] = tmp;
                 // when updating attributes clear the attributes, because they might change as well. New arguments are possible.
@@ -413,33 +421,60 @@ function adaptor_init(url,theme,dslx) { //{{{
     save['graph_theme'] = theme;
     save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
       manifestation.endpoints = save.endpoints_list;
-      graphrealization.draw_labels = function(max,labels,shift) {
-        $('#graphcanvas').css('grid-row', '1/span ' +( max.row + 1));
-        $('#graphgrid .graphlabel').remove();
-        $('#graphgrid').css('grid-template-rows', shift + 'px repeat(' + max.row + ', 1fr)');
+      graphrealization.draw_labels = function(max,labels,shift,striped) {
+        $('#graphcanvas').css('grid-row', '1/span ' + (max.row + 2));
+        if (striped == true) {
+          if (!$('#graphgrid').hasClass('striped')) {
+            $('#graphgrid').addClass('striped');
+          }
+        } else {
+          $('#graphgrid').removeClass('striped');
+        }
+
+        $('#graphgrid .graphlabel, #graphgrid .graphempty, #graphgrid .graphlast').remove();
         var tlabels = {};
         var tcolumns = [];
+        var tcolumncount = {}
         _.each(labels,function(val){
           if (val.label != "") {
             tlabels[val.row] = [];
             _.each(val.label,function(col) {
               if (!tcolumns.includes(col.column)) {
                 tcolumns.push(col.column);
+                tcolumncount[col.column] = 0;
               }
-              tlabels[val.row][tcolumns.indexOf(col.column)] = col.value;
+              if (col.value != undefined) {
+                tcolumncount[col.column] += 1;
+              }
+              tlabels[val.row][tcolumns.indexOf(col.column)] = { label: col.value, type: val.tname, id: val.element_id };
             });
           }
         });
+        $('#graphgrid').css({
+          'grid-template-rows': (shift/2) + 'px repeat(' + max.row + ', 1fr) ' + (shift/2) + 'px',
+          'grid-template-columns': 'max-content' + (tcolumns.length > 0 ? ' repeat(' + tcolumns.length.toString() + ',max-content)' : '') +  ' auto'
+        });
         for (var i = 0; i < max.row; i++) {
-          _.each(tlabels[i+1],function(col,j) {
-            if (col != undefined) {
-              $('#graphgrid').append($('<div class="graphlabel" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + shift + 'px"><span>' + col + '</span></div>'));
+          for (var j =0; j < tcolumns.length; j++) {
+            if (tlabels[i+1] != undefined && tlabels[i+1][j] != undefined && tlabels[i+1][j].label != undefined && tlabels[i+1][j].label != '') {
+              var col = tlabels[i+1][j];
+              var ele = $('<div class="graphlabel ' + (i % 2 == 0 ? 'odd' : 'even') + '" element-type="' + col.type + '" element-id="' + col.id + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '"><span>' + col.label + '</span></div>');
+              graphrealization.illustrator.draw.bind_event(ele,col.type,false);
+              $('#graphgrid').append(ele);
+            } else {
+              if (tcolumncount[tcolumns[j]] != 0) {
+                var ele = $('<div class="graphempty ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + shift + 'px">&#032;</div>');
+                $('#graphgrid').append(ele);
+              }
             }
-          });
+          }
+          var j = tcolumns.length;
+          var ele = $('<div class="graphlast ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + shift + 'px">&#032;</div>');
+          $('#graphgrid').append(ele);
         }
       };
       graphrealization.set_svg_container($('#graphcanvas'));
-      graphrealization.set_css_container($('#graphgrid'));
+      graphrealization.set_label_container($('#graphgrid'));
       graphrealization.set_description($(dslx), true);
       graphrealization.notify = function(svgid) {
         var g = graphrealization.get_description();
@@ -766,12 +801,27 @@ function save_svg() {// {{{
       gc.prepend($X('<style xmlns="http://www.w3.org/2000/svg" type="text/css"><![CDATA[' + res + ']]></style>'));
       $(window.document.styleSheets).each(function(i,x){
         if (x && x.href && x.href.match(/wfadaptor\.css$/)) {
+					var varreps = {};
           $(x.cssRules).each(function(j,y){
-            var loc = $(gc).find(y.selectorText.replace(/^svg /,''));
-            loc.attr('style',y.style.cssText + loc.attr('style') + ';');
+            if (y.selectorText == ":root") {
+              $(y.style).each(function(k,z) {
+								varreps['var\\(' + z + '\\)'] = getComputedStyle(document.documentElement).getPropertyValue(z).toString();
+							});
+            }
+            var loc = $(gc).find(y.selectorText.replace(/svg /g,''));
+						var cst = y.style.cssText;
+            for (k in varreps) {
+							cst = cst.replace(new RegExp(k,'g'),varreps[k]);
+						}
+            loc.each(function(k,loco) {
+              var sty = $(loco).attr('style') == undefined ? '' : $(loco).attr('style');
+              $(loco).attr('style',cst + sty);
+            });
           });
           var loc = $(gc).find('text.super');
           loc.attr('style',loc.attr('style') + ' display: none');
+          var loc = $(gc).find('.stripe');
+          loc.attr('style',loc.attr('style') + ' display: none');
         }
       });
       $.ajax({

data/cockpit/js/ui.js

@@ -18,9 +18,9 @@ $(document).ready(function() {
     $.ajax({
       url: "config.json",
       success: function(res){
-        $("input[name=repo-url]").val(res['repo-url']);
+        $("input[name=res-url]").val(res['res-url']);
         $("input[name=base-url]").val(res['base-url']);
-        $("body").attr('current-repo',res['repo-url']);
+        $("body").attr('current-resources',res['res-url']);
         $("body").attr('current-base',res['base-url']);
         $("body").attr('current-testsets',res['testsets-url']);
         cockpit();
@@ -28,16 +28,43 @@ $(document).ready(function() {
       error: function(){
         $("body").attr('current-testsets','testsets/');
         if (location.protocol.match(/^file/)) {
-          $("body").attr('current-repo',"http://localhost:" + $('body').data('res-port'));
+          $("body").attr('current-resources',"http://localhost:" + $('body').data('res-port'));
           $("body").attr('current-base',"http://localhost:" + $('body').data('base-port'));
         } else {
-          $("body").attr('current-repo',location.protocol + "//" + location.hostname + ":" + $('body').data('res-port'));
+          $("body").attr('current-resources',location.protocol + "//" + location.hostname + ":" + $('body').data('res-port'));
           $("body").attr('current-base',location.protocol + "//" + location.hostname + ":" + $('body').data('base-port'));
         }
-        $("input[name=repo-url]").val($("body").attr('current-repo'));
+        $("input[name=res-url]").val($("body").attr('current-resources'));
         $("input[name=base-url]").val($("body").attr('current-base'));
         cockpit();
       }
     });
   }
 });
+
+$(document).on('copy', '[contenteditable]', function (e) {
+  e = e.originalEvent;
+  var selectedText = window.getSelection();
+  var range = selectedText.getRangeAt(0);
+  var selectedTextReplacement = range.toString()
+  e.clipboardData.setData('text/plain', selectedTextReplacement);
+  e.preventDefault(); // default behaviour is to copy any selected text
+});
+
+// Paste fix for contenteditable
+$(document).on('paste', '[contenteditable]', function (e) {
+    e.preventDefault();
+
+    if (window.clipboardData) {
+        content = window.clipboardData.getData('Text');
+        if (window.getSelection) {
+            var selObj = window.getSelection();
+            var selRange = selObj.getRangeAt(0);
+            selRange.deleteContents();
+            selRange.insertNode(document.createTextNode(content));
+        }
+    } else if (e.originalEvent.clipboardData) {
+        content = (e.originalEvent || e).clipboardData.getData('text/plain');
+        document.execCommand('insertText', false, content);
+    }
+});