cpee 2.1.125 → 2.1.126

data/cockpit/css/mode_inactive.svg

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="39.688mm"
+   height="39.687504mm"
+   viewBox="0 0 39.688 39.687503"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   sodipodi:docname="mode_inactive.svg"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="4.0195288"
+     inkscape:cx="100.3849"
+     inkscape:cy="96.031157"
+     inkscape:window-width="3440"
+     inkscape:window-height="1371"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"><sodipodi:guide
+       position="-6.4326542,14.460154"
+       orientation="1,0"
+       id="guide1"
+       inkscape:locked="false" /><sodipodi:guide
+       position="9.2604167,30.427086"
+       orientation="1,0"
+       id="guide2"
+       inkscape:locked="false" /><sodipodi:guide
+       position="9.2604167,30.427086"
+       orientation="0,-1"
+       id="guide3"
+       inkscape:locked="false" /><sodipodi:guide
+       position="30.427083,10.583336"
+       orientation="1,0"
+       id="guide4"
+       inkscape:locked="false" /><sodipodi:guide
+       position="9.2604167,9.2604188"
+       orientation="0,-1"
+       id="guide5"
+       inkscape:locked="false" /><inkscape:grid
+       id="grid5"
+       units="mm"
+       originx="0"
+       originy="0"
+       spacingx="0.26458334"
+       spacingy="0.26458334"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       enabled="true"
+       visible="true" /></sodipodi:namedview><defs
+     id="defs1" /><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-46.644447,-28.77213)"><path
+       style="fill:none;stroke:#3d3846;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:0.427451"
+       d="M 53.259031,35.386714 V 51.261715 H 69.134032 V 35.386714 Z"
+       id="path5" /></g></svg>

data/cockpit/css/ui.css

@@ -186,9 +186,18 @@ span.vote {
 }
 
 #modelling {
-  flex: 1 1 auto;
+  flex: 0 1 auto;
+  height: 100%;
   overflow: scroll;
 }
+#input {
+  flex: 1 0 auto;
+}
+
+#graphcolumn ui-resizehandle {
+  margin-right: 0.2em;
+  margin-bottom: 0.2em;
+}
 
 #graphcolumn {
   margin: 0;

data/cockpit/js/compliance.js

@@ -0,0 +1,134 @@
+$(document).ready(function() { //{{{
+  $.ajax({
+    type: "GET",
+    url: "rngs/requirements.rng",
+    dataType: "xml",
+    success: function(rng){
+      save['requirements'] = new RelaxNGui(rng,$('#dat_requirements'));
+    }
+  });
+
+  $("#verify").click(function(){
+    var uuid = save.attributes_raw && save.attributes_raw.uuid;
+    if (!uuid) {
+      $('#comp_log').html('<p>No instance loaded.</p>');
+      return;
+    }
+
+    var baseUrl = 'https://cpee.org/comp-log/';
+    var currentUrl = baseUrl + uuid + '.xes.yaml';
+    var allUrl    = baseUrl + uuid + '.all.xes.yaml';
+
+    $('#comp-all-log').attr('href', allUrl).show();
+
+    function tryLoad(url, fallback) {
+      $.ajax({
+        type: 'GET',
+        url: url,
+        dataType: 'text',
+        success: function(yaml) {
+          $('#comp-current-log').attr('href', url).text(url.split('/').pop()).show();
+          displayComplianceMessages(yaml);
+        },
+        error: function() {
+          if (fallback) {
+            tryLoad(fallback, null);
+          } else {
+            $('#comp_log').html('<p>Could not load compliance log.</p>');
+          }
+        }
+      });
+    }
+
+    tryLoad(currentUrl, baseUrl + uuid + '.current.xes.yaml');
+  });
+
+  document.addEventListener('attributes:changed', function (e) {
+    let req = $X("<requirements xmlns='http://cpee.org/ns/properties/2.0'/>");
+    let reqs;
+    let regex = /\"\s*=>\s*"/g
+    if (save.attributes_raw.requirements.match(regex)) {
+      reqs = save.attributes_raw.requirements.replace(regex,"\":\"");
+    } else {
+      reqs = save.attributes_raw.requirements;
+    }
+    reqj = JSON.parse(reqs);
+    for (let key in reqj) {
+      let ele = $X("<" + key + " xmlns='http://cpee.org/ns/properties/2.0'/>");
+          ele.text(reqj[key]);
+      req.append(ele);
+    }
+    save['requirements'].content(req);
+  });
+
+  var timer;
+  // when input in one of the inputs, save
+  $(document).on('input','#dat_requirements input',function(event){
+    clearTimeout(timer);
+    timer = setTimeout(function(){ do_requirements_save(event); }, 5000);
+  });
+  $(document).on('relaxngui_remove', '#dat_requirements', function(event){
+    clearTimeout(timer);
+    do_requirements_save(event);
+  });
+  $(document).on('relaxngui_move', '#dat_requirements', function(event){
+    clearTimeout(timer);
+    do_requirements_save(event);
+  });
+  $(document).on('relaxngui_change', '#dat_requirements', function(event){
+    clearTimeout(timer);
+    do_requirements_save(event);
+  });
+}); //}}}
+
+function displayComplianceMessages(yaml) { //{{{
+  var messages = [];
+  var parts = yaml.split(/\n---\s*\n/);
+
+  for (var i = 0; i < parts.length; i++) {
+    var part = parts[i];
+    if (!part.match(/^event:/m)) continue;
+
+    // No /m flag: $ matches end-of-string only, preventing premature match on
+    // the first line of a multi-line YAML single-quoted scalar.
+    var m = part.match(/\n  data:\s*([\s\S]*?)(?=\n  [a-zA-Z]|\s*$)/);
+    if (!m) continue;
+
+    var val = m[1].trim();
+    if (!val) continue;
+
+    // Remove surrounding YAML flow-scalar single quotes and unescape ''
+    if (val.charAt(0) === "'" && val.charAt(val.length - 1) === "'") {
+      val = val.slice(1, -1).replace(/''/g, "'");
+    }
+    // Collapse multi-line continuation whitespace (incl. column-0 continuations)
+    val = val.replace(/\n[ \t]*/g, ' ').trim();
+
+    messages.push(val);
+  }
+
+  if (messages.length === 0) {
+    $('#comp_log').html('<div>No messages found.</div>');
+    return;
+  }
+
+  var html = '<div>Pre-Tests</div>';
+  for (var j = 0; j < messages.length; j++) {
+    var msg = messages[j];
+    var isHeader = /^Verifying Requirement R/.test(msg) || /^Requirement R/.test(msg);
+    var cls = isHeader ? '' : ' class="indent"';
+    html += '<div' + cls + '>' + $('<span>').text(msg).html() + '</div>';
+  }
+  $('#comp_log').html(html);
+} //}}}
+
+function do_requirements_save(event) { //{{{
+  if (save['requirements'].has_changed()) {
+    save['requirements'].set_checkpoint();
+    var url = $('body').attr('current-instance');
+    let reqj = save['requirements'].save_json();
+    let att = save['attributes'].save();
+    $(' > attributes > requirements', att).text(reqj);
+    do_parameters_save_part('attributes',$(att).serializePrettyXML());
+  }
+} //}}}

data/cockpit/js/instance.js

@@ -156,6 +156,9 @@ function cockpit() { //{{{
         uidash_toggle_vis_tab($('#instance'));
         uidash_toggle_vis_tab($('#parameters'));
       }
+      if (q.dea || q.dea == "") {
+        uidash_toggle_vis_tab($('#instance'));
+      }
       if (q.theme) { graph_theme = q.theme; }
       if (q.position) { graph_position = q.position == 'false' ? 'false' : 'true'; }
       if (q.highlight) {
@@ -518,7 +521,8 @@ function monitor_instance_values(type,vals) {// {{{
           var tmp = {};
           let deferreds = [];
           $(res).find(" > endpoints > *").each(function(k,v) {
-            save['endpoints_list'][v.localName] = v.lastChild.nodeValue;
+            let val = v.lastChild ? v.lastChild.nodeValue : '';
+            save['endpoints_list'][v.localName] = val;
             let rep = $('body').attr('current-resources');
             let def = new $.Deferred();
             deferreds.push(def);
@@ -559,6 +563,7 @@ function monitor_instance_values(type,vals) {// {{{
           $(" > attributes > *",res).each((k,v)=>{
             save['attributes_raw'][v.nodeName] = v.textContent;
           });
+          document.dispatchEvent(eval(type + '_changed'));
           if ($(" > attributes > resources",res).length > 0) {
             save['resources'] = $(" > attributes > resources",res).text();
           } else {