cpee 2.0.25 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3830f81020d6eb6b83ac9eba995f7175607f8aee0279b1537e0f5415f3dab21
-  data.tar.gz: a3e1ce78c221dae79d973435cc6997c3dc5e8d00ce8e5cd89634b2648b75012d
+  metadata.gz: c98641a6cc00767af290395984b5b99534adb37b7235ad223d412d99fe9969b4
+  data.tar.gz: 82db456ab83962e51373c961e41b13b7a2de21d0739d1a047bfc4c74ef548156
 SHA512:
-  metadata.gz: 56cb04c53af5f2f7eee0c0dcbb83d339a75985e32d7584294f33f5ec755b0d4db9bd4100e0e9c692d921f7bdfe5f60be0a167f7416484ddb6f67d250bb67a013
-  data.tar.gz: de22ffe114afc38010c7650c75e28b067ecec6fec52df16f96f08928a1038634e175636e0cc177d4ecd88ab4de1cc1a99e53a670578041a7f6515ca718c46c7e
+  metadata.gz: 0e2a3a1c77315364f0d400ddb2127e31e63e95ff1561ed24b63ac71cd2bc49dc122fddd73ecef28607af6f221180536f9256076a4c2b7cd90f2ca66744ce5b34
+  data.tar.gz: dfb4857bd734da1011f56658a8802686819669a348f1c29a8c1c35308dd1efb2d4d303ced6d57a4db484f55079f32f6282913d152b21e51229577a6b75b73679

data/cockpit/css/ui.css

@@ -74,6 +74,7 @@ body {
 
 #instance ui-content { height: 7em; }
 
+#areanew td:nth-child(2)       { padding-top: 0.4em; padding-bottom: 0.4em; }
 #areanew td:nth-child(1)       { width: 7em; padding-right: 1em; }
 #areanew td:nth-child(3)       { width: 16em; padding-left: 1em; }
 #areanew input                 {
@@ -106,13 +107,26 @@ ui-tabbed ui-tabbar ui-behind button {
   content: "|";
 }
 
-#parameters ui-content { height: 8.5em; min-height: 1.7em; }
+#parameters ui-content { height: 8.5em; min-height: 2.7em; }
 
-#areadataelements { height: 100%; overflow-x: hidden; overflow-y: scroll; }
+#areadataelements, #areaendpoints, #areaattributes {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  height: 100%;
+}
+#areadataelements > button, #areaendpoints > button, #areaattributes > button {
+  height: 100%;
+  padding: 0;
+  margin-right: 0.5em;
+}
+#areadataelements > button span, #areaendpoints > button span, #areaattributes > button span {
+  display: inline-block;
+  transform: rotate(-90deg);
+}
+#areadataelements.inactive, #areaendpoints.inactive, #areaattributes.inactive { display: none; }
 #areadataelements button.relaxngui_control { display: none; }
-#areaendpoints { height: 100%; overflow-x: hidden; overflow-y: scroll; }
 #areaendpoints button.relaxngui_control { display: none; }
-#areaattributes { height: 100%; overflow-x: hidden; overflow-y: scroll; }
 #areaattributes button.relaxngui_control { display: none; }
 
 #areainstance input[type=file]         { display: none; }
@@ -154,6 +168,9 @@ ui-tabbed ui-tabbar ui-behind button {
   margin:0;
   padding:0;
   width: 100%;
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: scroll;
 }
 
 #dat_dataelements {
@@ -163,6 +180,9 @@ ui-tabbed ui-tabbar ui-behind button {
   margin:0;
   padding:0;
   width: 100%;
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: scroll;
 }
 #dat_attributes {
   border-collapse:collapse;
@@ -171,6 +191,9 @@ ui-tabbed ui-tabbar ui-behind button {
   margin:0;
   padding:0;
   width: 100%;
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: scroll;
 }
 
 #areadsl div { padding: 0 1em; }

data/cockpit/css/wfadaptor.css

@@ -108,6 +108,17 @@ svg .stand {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
+svg .standthin {
+  fill: var(--wfadaptor-background);
+  fill-opacity:1;
+  stroke: var(--wfadaptor-base);
+  stroke-width:1.0;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
 svg .standfat {
   fill: var(--wfadaptor-background);
   fill-opacity:1;

data/cockpit/edit.html

@@ -36,11 +36,11 @@
 
     <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
 
-    <script type="text/javascript" src="/js_libs/ui.js"></script>
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
     <script type="text/javascript" src="/js_libs/custommenu.js"></script>
 
     <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
-    <link   rel="stylesheet"      href="/js_libs/ui.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
 
@@ -61,7 +61,7 @@
       /* shit balls, no elegance is left in this world */
     </style>
   </head>
-  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
+  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">
      <div id='disclaimer' class='hidden'> <!--{{{-->
        <h1>Disclaimer</h1>
 
@@ -120,7 +120,7 @@
     <ui-tabbed id="instance">
       <ui-tabbar>
         <ui-tab class="switch"                                                ></ui-tab>
-        <ui-tab class=""                data-tab="new"       id="tabnew"      >New</ui-tab>
+        <ui-tab class=""                data-tab="new"       id="tabnew"      >Config</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 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>
@@ -132,17 +132,14 @@
           <tr>
             <td>Resources:</td>
             <td><input name="res-url" type="text" value=""/></td>
-            <td></td>
           </tr>
           <tr>
             <td>Engine:</td>
             <td><input name="base-url" type="text" value=""/></td>
-            <td><button name="base">create new instance</button></td>
           </tr>
           <tr>
             <td>Instance:</td>
             <td><input name="instance-url" type="text" value=""/></td>
-            <td><button name="instance">monitor instance</button></td>
           </tr>
           </table>
         </ui-area> <!--}}}-->
@@ -213,17 +210,20 @@
         <ui-tab class=""         data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
         <ui-tab class="inactive" data-tab="endpoints"    id="tabendpoints"   >Endpoints</ui-tab>
         <ui-tab class="inactive" data-tab="attributes"   id="tabattributes"  >Attributes</ui-tab>
-        <ui-behind                                                           ><button title='add entry'>New</button></ui-behind>
+        <ui-behind                                                           ></ui-behind>
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="dataelements" id="areadataelements"> <!--{{{-->
+          <button title='add entry'><span>New</span></button>
           <div id="dat_dataelements"></div>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="endpoints" id="areaendpoints" class="inactive"> <!--{{{-->
-          <table id="dat_endpoints"></table>
+          <button title='add entry'><span>New</span></button>
+          <div id="dat_endpoints"></div>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="attributes" id="areaattributes" class="inactive"> <!--{{{-->
-          <table id="dat_attributes"></table>
+          <button title='add entry'><span>New</span></button>
+          <div id="dat_attributes"></div>
         </ui-area> <!--}}}-->
       </ui-content>
     </ui-tabbed>

data/cockpit/graph.html

@@ -37,11 +37,11 @@
 
     <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
 
-    <script type="text/javascript" src="/js_libs/ui.js"></script>
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
     <script type="text/javascript" src="/js_libs/custommenu.js"></script>
 
     <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
-    <link   rel="stylesheet"      href="/js_libs/ui.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
 
@@ -56,7 +56,7 @@
     <script type="text/javascript" src="js/parameters.js"></script>
     <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">
+  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">
     <div class='hidden' id='relaxngworker'></div>
     <div id="trackfull">
       <div id='graphcolumn'>

data/cockpit/index.html

@@ -36,11 +36,11 @@
 
     <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
 
-    <script type="text/javascript" src="/js_libs/ui.js"></script>
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
     <script type="text/javascript" src="/js_libs/custommenu.js"></script>
 
     <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
-    <link   rel="stylesheet"      href="/js_libs/ui.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
 
@@ -60,7 +60,7 @@
       /* shit balls, no elegance is left in this world */
     </style>
   </head>
-  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
+  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">
      <div id='disclaimer' class='hidden'> <!--{{{-->
        <h1>Disclaimer</h1>
 
@@ -211,17 +211,20 @@
         <ui-tab class=""         data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
         <ui-tab class="inactive" data-tab="endpoints"    id="tabendpoints"   >Endpoints</ui-tab>
         <ui-tab class="inactive" data-tab="attributes"   id="tabattributes"  >Attributes</ui-tab>
-        <ui-behind                                                           ><button title='add entry'>New</button></ui-behind>
+        <ui-behind                                                           ></ui-behind>
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="dataelements" id="areadataelements"> <!--{{{-->
+          <button title='add entry'><span>New</span></button>
           <div id="dat_dataelements"></div>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="endpoints" id="areaendpoints" class="inactive"> <!--{{{-->
-          <table id="dat_endpoints"></table>
+          <button title='add entry'><span>New</span></button>
+          <div id="dat_endpoints"></div>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="attributes" id="areaattributes" class="inactive"> <!--{{{-->
-          <table id="dat_attributes"></table>
+          <button title='add entry'><span>New</span></button>
+          <div id="dat_attributes"></div>
         </ui-area> <!--}}}-->
       </ui-content>
     </ui-tabbed>

data/cockpit/js/details.js

@@ -49,7 +49,6 @@ function do_main_work() { //{{{
   var origtype = orignode.attr('element-type') + '_' + orignode.attr('element-endpoint');
 
   var url = $('body').attr('current-instance');
-  $('#main ui-tabbar ui-behind button').removeClass('highlight');
   save['details'].set_checkpoint();
 
   var nnew = $(save['details'].save().documentElement);

data/cockpit/js/instance.js

@@ -53,7 +53,7 @@ var sub_more = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'handlerwrapper' + '&' +
+               'topic'  + '=' + 'connectionwrapper' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
@@ -75,14 +75,14 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'handlerwrapper' + '&' +
+               'topic'  + '=' + 'connectionwrapper' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
 
 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=res-url]").val(),false,false); });
+  $("button[name=instance]").click(function(){ uidash_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($('#templates'),function(){ load_testset(false) } ); });
   $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
@@ -105,10 +105,15 @@ function cockpit() { //{{{
           $('#templates').append($("<div class='menuitem'></div>").text(this.name.replace(/\.xml/,'')));
         }
       });
+    },
+    error: function() {
+      $("button[name=loadtestset]").attr('disabled','disabled');
+    },
+    complete: function() {
       var q = $.parseQuerySimple();
       if (q.min || q.min == "") {
-        ui_toggle_vis_tab($('#instance'));
-        ui_toggle_vis_tab($('#parameters'));
+        uidash_toggle_vis_tab($('#instance'));
+        uidash_toggle_vis_tab($('#parameters'));
       }
       if (q.monitor && q.load) {
         if (q.load.match(/https?:\/\//)) {
@@ -118,7 +123,7 @@ function cockpit() { //{{{
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         monitor_instance(q.monitor,$("body").attr('current-resources'),true,false);
       } else if (q.load) {
         if (q.load.match(/https?:\/\//)) {
@@ -128,20 +133,20 @@ function cockpit() { //{{{
             if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         create_instance($("body").attr('current-base'),q.load,true,false);
       } else if (q.instantiate) {
         if (q.instantiate.match(/https?:\/\//)) {
-          ui_activate_tab("#tabexecution");
+          uidash_activate_tab("#tabexecution");
           create_instance_from($("body").attr('current-base'),q.instantiate,false);
         } else {
           alert('Nope. Url!');
         }
       } else if (q.new || q.new == "") {
-        ui_activate_tab("#tabinstance");
+        uidash_activate_tab("#tabinstance");
         create_instance($("body").attr('current-base'),"Plain Instance",false,false);
       } else if (q.monitor) {
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabinstance");
         monitor_instance(q.monitor,$("body").attr('current-resources'),false,false);
       } else if (q.exec) {
         if (q.exec.match(/https?:\/\//)) {
@@ -151,7 +156,7 @@ function cockpit() { //{{{
             if ($(v).text() == q.exec) { $(v).attr('data-selected','selected'); }
           });
         }
-        ui_activate_tab("#tabexecution");
+        uidash_activate_tab("#tabexecution");
         create_instance($("body").attr('current-base'),q.exec,true,true);
       }
     }
@@ -324,7 +329,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
   $("input[name=instance-url]").val($("body").attr('current-instance'));
   $("input[name=res-url]").val($("body").attr('current-resources'));
 
-  $('.tabbehind button').hide();
+  $('#parameters ui-content ui-area > button').attr('disabled','disabled');
   $('#dat_details').empty();
 
   url = $("body").attr('current-instance');
@@ -380,7 +385,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
     },
     error: function(a,b,c) {
       alert("This ain't no CPEE instance");
-      ui_activate_tab("#tabnew");
+      uidash_activate_tab("#tabnew");
     }
   });
 }// }}}
@@ -726,10 +731,11 @@ function monitor_instance_state_change(notification) { //{{{
     }
 
     if (notification != "ready" && notification != "stopped" && notification != "running") {
-      $('.tabbehind button').hide();
+      console.log('rrr');
+      $('#parameters ui-content ui-area > button').attr('disabled','disabled');
       $('#state_any').hide();
     } else {
-      $('#parameters .tabbehind button').show();
+      $('#parameters ui-content ui-area > button').removeAttr('disabled');
       $('#state_any').show();
     }
 
@@ -898,7 +904,7 @@ async function set_testset(testset,exec) {// {{{
   var promises = [];
 
   var tset = $X('<properties xmlns="http://cpee.org/ns/properties/2.0"/>');
-  tset.append($("testset > handlerwrapper",testset));
+  tset.append($("testset > executionwrapper",testset));
   tset.append($("testset > positions",testset));
   tset.append($("testset > dataelements",testset));
   tset.append($("testset > endpoints",testset));
@@ -1026,7 +1032,6 @@ function load_testset(exec) {// {{{
       url: url,
       success: function(res){
         save['dsl'] = null; // reload dsl and position under all circumstances
-        $('#main .tabbehind button').hide();
         $('#dat_details').empty();
 
         document.title = "Untitled";
@@ -1210,8 +1215,10 @@ function format_visual_vote_clear() {//{{{
 
 function format_instance_pos() { //{{{
   $(save['instance_pos']).each(function(){
-    var what = this.nodeName;
-    format_visual_add(what,save['state'] == 'running' ? 'active' : 'passive');
+    console.log(this);
+    var taskname = this.nodeName;
+    var taskstate = this.textContent;
+    format_visual_add(taskname,save['state'] == 'running' ? (taskstate == 'at' ? 'active' : 'passive') : 'passive');
   });
 } //}}}
 

data/cockpit/js/model.js

@@ -1,16 +1,11 @@
 $(document).ready(function() {
-  $('#tabmodel').click(function(event){
-    $('#model ui-behind button:nth-child(1)').addClass('hidden');
-  });
-  $('#tabdataelements').click(function(event){
-    $('#model ui-behind button:nth-child(1)').removeClass('hidden');
-  });
-
-  $('#model ui-behind button:nth-child(1)').click(function(event){
-    var but = $(document).find('#model ui-content ui-area:not(.inactive) button');
+  $('#model ui-content ui-area > button').click(function(event){
+    var but = $(document).find('#model ui-content ui-area:not(.inactive) > div button');
         but.click();
-    var are = $(document).find('#model ui-content ui-area:not(.inactive)');
-    var tab = $(document).find('#model ui-content ui-area:not(.inactive) .relaxngui_table');
+    var inp = $(document).find('#model ui-content ui-area:not(.inactive) > div input');
+        $(inp[inp.length-2]).focus();
+    var are = $(document).find('#model ui-content ui-area:not(.inactive) > div');
+    var tab = $(document).find('#model ui-content ui-area:not(.inactive) > div > div');
         are.animate({ scrollTop: tab.height() }, "slow");
   });
 });

data/cockpit/js/parameters.js

@@ -30,11 +30,13 @@ $(document).ready(function() {
   }); //}}}
 
   // new entry //{{{
-  $('#parameters ui-behind button:nth-child(1)').click(function(event){
-    var but = $(document).find('#parameters ui-content ui-area:not(.inactive) button');
+  $('#parameters ui-content ui-area > button').click(function(event){
+    var but = $(document).find('#parameters ui-content ui-area:not(.inactive) > div button');
         but.click();
-    var are = $(document).find('#parameters ui-content ui-area:not(.inactive)');
-    var tab = $(document).find('#parameters ui-content ui-area:not(.inactive) .relaxngui_table');
+    var inp = $(document).find('#parameters ui-content ui-area:not(.inactive) > div input');
+        $(inp[inp.length-2]).focus();
+    var are = $(document).find('#parameters ui-content ui-area:not(.inactive) > div');
+    var tab = $(document).find('#parameters ui-content ui-area:not(.inactive) > div > div');
         are.animate({ scrollTop: tab.height() }, "slow");
   }); //}}}
 

data/cockpit/js/wfadaptor.js

@@ -559,6 +559,8 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     if(root.tagName == 'description') { // First parsing {{{
       pos.row++;
       $(root).attr('svg-id','description');
+      $(root).attr('svg-type','description');
+      $(root).attr('svg-subtype','description');
       group.attr('element-id','group-description');
       if (illustrator.elements[sname].label) {
         labels.push({row: pos.row, element_id: 'start', tname: 'start', label: illustrator.elements[sname].label(root)});