cpee 1.5.16 → 1.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ffc8fabd041a5e647f3fb16f56d0e484932dc70fd8ba1871eb7a79d06eec77c
-  data.tar.gz: 69e814034e4022ecfb5e8334aa10bc3e9c0eb55cfaded1a879df16f49cbd571b
+  metadata.gz: d80dc7f1d5a376c5c0a77c949761d4dd996ae97111cd7de1b905a431e46d3050
+  data.tar.gz: bde193cb9e443474b0c70491b87abc2c0f2ef1313ed8ed96300bde8a65ffee44
 SHA512:
-  metadata.gz: c460baadf6a8882fc1cad5452926e9f569184a40f69f7c1971ecf0ddb73920449927451142bd3153db690166fc268e9208237222d92e6dd734e4f38a91f5353b
-  data.tar.gz: 88a2ce31209987e68fa5e543df287b32ec27f21507189824931e3a485ee65fd6ea6907d37d9f75d9b6a8276364e4d1f06f98705065c3dab0993f7bd6cf1cd888
+  metadata.gz: e146270c98f8086a2efc59b36cfb7ff8e91929e565254800e01fcf93f5bf06a1ae0818c54bc2d429145c22f2a14e81a4e4e0c0eab16e5f83ea0a12a40ef6d3e3
+  data.tar.gz: c97d9a5a41a14f76de725ecfa5e361b8f5960634b77c084ab1aa9d2d72946cfef8fe5df04c81e876371cd221d6acf50c4b53d5b84aa73d3466d6ba97c238a2f9

data/cockpit/css/model.css

@@ -0,0 +1,24 @@
+#areamodel input[type=file]         { display: none; }
+#areamodel div.section              { display: table-cell; vertical-align: middle; }
+#areamodel div.section:nth-child(1) {                                                  padding: 0 0.5em 0 0; white-space: nowrap; }
+#areamodel div.section:nth-child(2) { border-left: 1px solid var(--x-ui-border-color); padding: 0 0.5em;     white-space: nowrap; }
+#areamodel div.section:nth-child(3) { border-left: 1px solid var(--x-ui-border-color); padding: 0 0.5em;     white-space: nowrap; }
+#areamodel div.section:nth-child(4) { border-left: 1px solid var(--x-ui-border-color); padding: 0 0 0 0.5em; white-space: nowrap; }
+
+#areamodel div.section:nth-child(1) button                       { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areamodel div.section:nth-child(1) button[name=save]            { white-space: normal; width: 10em; height: 5.5em; margin-left: 0.2em; }
+
+#areamodel div.section:nth-child(2) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areamodel div.section:nth-child(2) button                       { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areamodel div.section:nth-child(2) div:nth-child(2)             { white-space: normal; text-align: right; }
+#areamodel div.section:nth-child(2) button[name=loadtestsetfile] { white-space: normal; width: 10em; height: 3.5em; margin-left: 0.2em; }
+#areamodel div.section:nth-child(2) button[name=loadmodelfile]   { white-space: normal; width: 10em; height: 2em;   margin-top: 0.2em; }
+
+#areamodel div.section:nth-child(3) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areamodel div.section:nth-child(3) button                       { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areamodel div.section:nth-child(3) div:nth-child(2)             { white-space: normal; text-align: right; }
+#areamodel div.section:nth-child(3) button[name=savetestsetfile] { white-space: normal; width: 10em; height: 3.5em; margin-left: 0.2em; }
+#areamodel div.section:nth-child(3) button[name=savesvgfile]     { white-space: normal; width: 10em; height: 2em;   margin-top: 0.2em; }
+
+#areamodel div.section:nth-child(4) div                          { white-space: normal; vertical-align: middle; margin: 0; padding: 0; }
+#areamodel div.section:nth-child(4) button[name=loadmodeltype]   { white-space: normal; width: 10em; height: 2em; }

data/cockpit/css/ui.css

@@ -7,6 +7,13 @@ body {
   font-size: 1em;
 }
 
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
 #graphgrid {
   display: grid;
   grid-gap: 0;
@@ -49,6 +56,24 @@ body {
   color: var(--wfadaptor-selected);
 }
 
+#graphgrid .graphlabel.selected a, #graphgrid .graphlabel.hover a {
+  color: var(--wfadaptor-selected);
+}
+#graphgrid .graphlabel a {
+  color: var(--x-ui-light-text-color);
+}
+#graphgrid .graphlabel a::after {
+  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 {
+  color: var(--wfadaptor-selected);
+}
+
 #instance ui-content { height: 7em; }
 
 #areanew td:nth-child(1)       { width: 7em; padding-right: 1em; }

data/cockpit/index.html

@@ -149,23 +149,23 @@
               <form id='fuckchrome'>
                 <input type='file' name='testsetfile' id='testsetfile'/>
               </form>
-              <button title='a testset includes various setting, subscriptions and a model' name="loadtestset">load predefined testset</button><button title='a testset includes various setting, subscriptions and a model' name="loadtestsetfile">load testset file</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="loadtestset">load predefined testset</button><button title='a testset includes various settings, subscriptions and a model' name="loadtestsetfile">load testset file</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="savetestset" href="" download=""></a>
-            <a id="savesvg" href="" download=""></a>
-            <button title='a testset includes various setting, subscriptions and a model' name="savetestset">save testset</button>
-            <button title='a testset includes various setting, subscriptions and a model' name="savesvg">save svg graph</button>
+            <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 setting, subscriptions and a model' name="loadmodeltype">set model type</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="loadmodeltype">set model type</button>
             </div>
           </div>
         </ui-area> <!--}}}-->

data/cockpit/js/details.js

@@ -29,64 +29,82 @@ $(document).ready(function() {
     clearTimeout(timer);
     do_main_save();
   });
+  $(document).on('relaxngui_move', '#dat_details', function(e){
+    clearTimeout(timer);
+    do_main_save();
+  });
 });
 
 function do_main_save() { //{{{
   if (save['details'].has_changed()) {
-    var svgid    = save['details_target'].svgid;
-    var desc     = save['details_target'].model;
-    var node     = desc.get_node_by_svg_id(svgid);
-    var orignode = save['graph_adaptor'].illustrator.get_node_by_svg_id(svgid).parents('g.element[element-id]');
-    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();
-
-    // pull out xml and add XMLNS
-    // sadly we have to serialze, add in string and then parse again
-    // as adding namespaces to nodes is not supported
-    // serialization and reparsing is faster and more robust than xslt option
-    var nnew = $(save['details'].save().documentElement);
-        nnew.attr('svg-id',svgid);
-        nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
-
-    if ($('*[svg-id]',node).length > 0) {
-      nnew.append(node.children().filter(function(){ return this.attributes['svg-id'] != undefined; }));
+    do_main_work();
+  }
+} //}}}
+
+function do_main_work() { //{{{
+  var svgid    = save['details_target'].svgid;
+  var desc     = save['details_target'].model;
+  var node     = desc.get_node_by_svg_id(svgid);
+  var orignode = save['graph_adaptor'].illustrator.get_node_by_svg_id(svgid).parents('g.element[element-id]');
+  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();
+
+  // pull out xml and add XMLNS
+  // sadly we have to serialze, add in string and then parse again
+  // as adding namespaces to nodes is not supported
+  // serialization and reparsing is faster and more robust than xslt option
+  var nnew = $(save['details'].save().documentElement);
+      nnew.attr('svg-id',svgid);
+      nnew.attr('trans-xmlns','http://cpee.org/ns/description/1.0');
+
+  if ($('*[svg-id]',node).length > 0) {
+    nnew.append(node.children().filter(function(){ return this.attributes['svg-id'] != undefined; }));
+  }
+
+  var ntxt = nnew.serializeXML();
+      ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
+
+  node.replaceWith($X(ntxt));
+
+  var ttarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);
+  var tnewnode = ttarget.parents('g.element[element-id]');
+  var tnewtype = tnewnode.attr('element-type') + '_' + tnewnode.attr('element-endpoint');
+
+  desc.refresh(function(graphrealization){
+    var vtarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);
+    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();
+    save['graph'] = $X(g);
+    save['graph'].find('[xmlns]').removeAttr('xmlns');
 
-    var ntxt = nnew.serializeXML();
-        ntxt = ntxt.replace(/trans-xmlns/,'xmlns');
-
-    node.replaceWith($X(ntxt));
-    desc.refresh(function(graphrealization){
-      var vtarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);
-      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();
-      save['graph'] = $X(g);
-      save['graph'].find('[xmlns]').removeAttr('xmlns');
-      if (newtype != origtype) {
-        manifestation.update_details(svgid);
-      }
+    if (newtype != origtype) {
+      manifestation.update_details(svgid);
+      do_main_work();
+    } else {
+      $.ajax({
+        type: "PUT",
+        url: url + "/properties/values/description/",
+        headers: {
+          "Event-Source": myid
+        },
+        data: ({'content': '<content>' + desc.get_description() + '</content>'})
+      });
       adaptor_update();
       format_instance_pos();
-    });
-
-    $.ajax({
-      type: "PUT",
-      url: url + "/properties/values/description/",
-      headers: {
-        "Event-Source": myid
-      },
-      data: ({'content': '<content>' + desc.get_description() + '</content>'})
-    });
-  }
+
+      document.dispatchEvent(graph_changed);
+    }
+
+  });
 } //}}}

data/cockpit/js/instance.js

@@ -5,6 +5,7 @@ var paths = '#dat_details input, #dat_details textarea, #dat_details select, #da
 var loading = false;
 var subscription;
 var subscription_state = 'less';
+var graph_changed = new Event("graph:changed", {"bubbles":true, "cancelable":false});
 var save = {};
     save['state']= undefined;
     save['dsl'] = undefined;
@@ -74,8 +75,8 @@ function cockpit() { //{{{
   $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
   $("button[name=loadmodeltype]").click(function(e){new CustomMenu(e).menu($('#modeltypes'),load_modeltype, $("button[name=loadmodeltype]")); });
-  $("button[name=savetestset]").click(function(){ save_testset(); });
-  $("button[name=savesvg]").click(function(){ save_svg(); });
+  $("button[name=savetestsetfile]").click(function(){ save_testsetfile(); });
+  $("button[name=savesvgfile]").click(function(){ save_svgfile(); });
   $("button[name=state_start]").click(function(){ $(this).attr("disabled","disabled");start_instance(); });
   $("button[name=state_stop]").click(function(){ $(this).attr("disabled","disabled");stop_instance(); });
   $("button[name=state_replay]").click(function(){ $(this).attr("disabled","disabled");replay_instance(); });
@@ -117,6 +118,13 @@ function cockpit() { //{{{
         }
         ui_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");
+          create_instance_from($("body").attr('current-base'),q.instantiate,false);
+        } else {
+          alert('Nope. Url!');
+        }
       } else if (q.new || q.new == "") {
         ui_activate_tab("#tabinstance");
         create_instance($("body").attr('current-base'),"Plain Instance",false,false);
@@ -187,6 +195,29 @@ function check_subscription() { // {{{
   }
 }// }}}
 
+function create_instance_from(base,url,exec) {// {{{
+  $.get({
+    url: url,
+    dataType: "text",
+    success: function(res) {
+      $.ajax({
+        type: "POST",
+        url: base,
+        contentType: 'application/xml',
+        dataType: "text",
+        headers: { 'CONTENT-ID': 'xml' },
+        data: res,
+        success: function(res){
+          var iu = (base + "//" + res + "/").replace(/\/+/g,"/").replace(/:\//,"://");
+          monitor_instance(iu,$("body").attr('current-resources'),false,exec);
+        },
+        error: function(a,b,c) {
+          alert("No CPEE running.");
+        }
+      });
+    }
+  });
+}// }}}
 function create_instance(base,name,load,exec) {// {{{
   var info = name ? name : prompt("Instance info?", "Enter info here");
   if (info != null) {
@@ -331,8 +362,9 @@ function monitor_instance(cin,rep,load,exec) {// {{{
           });
           append_to_log("monitoring", "id", subscription);
           websocket();
-          if (load || exec)
+          if (load || exec) {
             load_testset(exec);
+          }
         }
       });
     },
@@ -480,6 +512,7 @@ function adaptor_init(url,theme,dslx) { //{{{
         var g = graphrealization.get_description();
         save['graph'] = $X(g);
         save['graph'].find('[xmlns]').removeAttr('xmlns');
+        document.dispatchEvent(graph_changed);
         $.ajax({
           type: "PUT",
           url: url + "/properties/values/description/",
@@ -488,6 +521,9 @@ function adaptor_init(url,theme,dslx) { //{{{
         adaptor_update();
         manifestation.events.click(svgid);
         format_instance_pos();
+        if (manifestation.selected() == "unknown") { // nothing selected
+          $('#dat_details').empty();
+        }
       };
       adaptor_update();
       monitor_instance_pos();
@@ -518,7 +554,7 @@ function monitor_graph_change(force) { //{{{
             adaptor_init(url,$('value',res).text(),dslx);
           },
           error: function() {
-            adaptor_init(url,'labels',dslx);
+            adaptor_init(url,'preset',dslx);
           }
         });
       }
@@ -728,7 +764,18 @@ function stop_instance() {// {{{
   });
 }// }}}
 
-function save_testset() {// {{{
+function save_testsetfile() {// {{{
+  var def = new $.Deferred();
+  def.done(function(name,testset) {
+    var ct = new Date();
+    $('#savetestsetfile').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
+    $('#savetestsetfile').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
+    document.getElementById('savetestsetfile').click();
+  });
+  get_testset(def);
+}// }}}
+
+function get_testset(deferred) {// {{{
   var url = $('body').attr('current-instance');
   var testset = $X('<testset/>');
 
@@ -770,27 +817,24 @@ function save_testset() {// {{{
                       pars.append($(res.documentElement).children());
                       pars.find('uuid').remove();
                       testset.append(pars);
-                      var ct = new Date();
-                      $('#savetestset').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
-                      $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
-                      document.getElementById('savetestset').click();
+                      deferred.resolve(name,testset);
                     },
-                    error: report_failure
+                    error: function() { deferred.reject(); report_failure(); }
                   });
                 },
-                error: report_failure
+                error: function() { deferred.reject(); report_failure(); }
               });
             },
-            error: report_failure
+            error: function() { deferred.reject(); report_failure(); }
           });
         },
-        error: report_failure
+        error: function() { deferred.reject(); report_failure(); }
       });
     },
-    error: report_failure
+    error: function() { deferred.reject(); report_failure(); }
   });
 }// }}}
-function save_svg() {// {{{
+function save_svgfile() {// {{{
   var url = $('body').attr('current-instance');
 
   var gc = $('#graphcanvas').clone();
@@ -830,9 +874,9 @@ function save_svg() {// {{{
         success: function(res){
           var name = $(res.documentElement).text();
 
-          $('#savesvg').attr('download',name + '.svg');
-          $('#savesvg').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(gc.serializeXML()));
-          document.getElementById('savesvg').click();
+          $('#savesvgfile').attr('download',name + '.svg');
+          $('#savesvgfile').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(gc.serializeXML()));
+          document.getElementById('savesvgfile').click();
         },
         error: report_failure
       });

data/cockpit/js/model.js

@@ -0,0 +1,41 @@
+document.addEventListener('graph:changed', function (e) {
+  $("button[name=save]").prop("disabled",false);
+}, false);
+
+$(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');
+        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');
+        are.animate({ scrollTop: tab.height() }, "slow");
+  });
+
+  $("button[name=save]").click(function(){
+    var def = new $.Deferred();
+    def.done(function(name,testset) {
+      $.ajax({
+        url: $('body').attr('current-save') + name + '.xml',
+        type: 'PUT',
+        contentType: 'application/xml',
+        data: testset.serializePrettyXML(),
+        headers: { 'Content-ID': 'content' },
+        success: function() {
+          $("button[name=save]").prop("disabled",true);
+          $("#lastsavedline").removeClass('hidden');
+          var dt = new Date();
+          var time = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
+          $("#lastsaved").text(time);
+        }
+      });
+    });
+    get_testset(def);
+  });
+});