cpee-model-management 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce614812f4658c4e62170443af46efcd32843661fefc6f65d22be139e16cb5e4
-  data.tar.gz: 2e15d839338f8be623e9b536b067778d452e68a7b3e50359672099d7db382ef7
+  metadata.gz: eb4c3a55fe08f20e52d1908aa0285f9783d8413a470bd0b034829569d7d39620
+  data.tar.gz: f0eeae82d2bc796f2976375113f0bd8616cb59e9b4e95541f3175f9cbd6565d1
 SHA512:
-  metadata.gz: 45fae847a02d31b3332ddb8394192eae4e107ec6cdbd4287f3b2408bdb46ab38e55ee27c558f7bbd04ada97db1cc74b82d3294343bb40f0b2a166a43aba47774
-  data.tar.gz: 67b92d5bfe550a32aab89999ef5709b4928d277d7b4ef6ca75d6cf3f032a19b266aae72004580897c85088d2e4ad4017cf2bb931b8450424b797a20d115ee4af
+  metadata.gz: dce3271b164de9f31aa0aef4dde102501c448a93067f0259d787446facbc72a119e617f35c09a02778e20114a07acdb08a9b76493a297ac05130c7ad0b542786
+  data.tar.gz: 1eac23abe60a8d110ff7e2b154502b4756629576b7d6c2a225360160ab31288fcb4d9e4ba58eed489261fcd21334fac96d9b18aab355e8b60d5b2374cfea5d60

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.0.15"
+  s.version          = "1.0.16"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."

data/lib/cpee-model-management/implementation.rb

@@ -191,7 +191,7 @@ module CPEE
         end.compact.uniq.sort_by{ |e| e[:name] } + Dir.glob(File.join(models,where,'*.xml')).map do |f|
           attrs = JSON::load File.open(f + '.attrs')
           fstage = attrs['design_stage'] rescue 'draft'
-          { :type => :file, :name => File.basename(f), :creator => attrs['creator'], :author => attrs['author'], :guarded => attrs['resource_restriction'], :guarded_what => attrs['resource_id'], :stage => fstage, :date => File.mtime(f).xmlschema } if stage.include?(fstage)
+          { :type => :file, :name => File.basename(f), :creator => attrs['creator'], :author => attrs['author'], :guarded => attrs['guarded'], :guarded_id => attrs['guarded_id'], :stage => fstage, :date => File.mtime(f).xmlschema } if stage.include?(fstage)
         end.compact.uniq.sort_by{ |e| e[:name] }
 
         Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(names))
@@ -210,7 +210,7 @@ module CPEE
         end.compact.uniq.sort_by{ |e| e[:name] } + Dir.glob(File.join(models,'*.xml')).map do |f|
           attrs = JSON::load File.open(f + '.attrs')
           fstage = attrs['design_stage'] rescue 'draft'
-          { :type => :file, :name => File.basename(f), :creator => attrs['creator'], :author => attrs['author'], :guarded => attrs['resource_restriction'], :guarded_what => attrs['resource_id'], :stage => fstage, :date => File.mtime(f).xmlschema } if stage.include?(fstage)
+          { :type => :file, :name => File.basename(f), :creator => attrs['creator'], :author => attrs['author'], :guarded => attrs['guarded'], :guarded_id => attrs['guarded_id'], :stage => fstage, :date => File.mtime(f).xmlschema } if stage.include?(fstage)
         end.compact.uniq.sort_by{ |e| e[:name] }
 
         Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(names))
@@ -372,7 +372,7 @@ module CPEE
         source = @p[1] ? File.join(models,where,@p[1].value) : (templates[stage] ? templates[stage] : 'testset.xml')
         fname = File.join(models,where,name + '.xml')
 
-        attrs = JSON::load File.open(fname + '.attrs')
+        attrs = JSON::load File.open(fname + '.attrs') rescue {}
         stage = attrs['design_stage'] if stage.nil? && attrs['design_stage']
         stage = views[stage] if views && views[stage]
 

data/server/model.xml

@@ -25,8 +25,8 @@
     <info>none</info>
     <creator>Juergen Mangler</creator>
     <author>Juergen Mangler</author>
-    <resource_restriction>none</resource_restriction>
-    <resource_id></resource_id>
+    <guarded>none</guarded>
+    <guarded_id></guarded_id>
     <model_uuid></model_uuid>
     <model_version></model_version>
     <modeltype>CPEE</modeltype>

data/server/testset.xml

@@ -18,8 +18,8 @@
     <creator>Juergen Mangler</creator>
     <author>Juergen Mangler</author>
     <modeltype>CPEE</modeltype>
-    <resource_restriction>none</resource_restriction>
-    <resource_id></resource_id>
+    <guarded>none</guarded>
+    <guarded_id></guarded_id>
     <model_uuid></model_uuid>
     <model_version></model_version>
     <theme>extended</theme>

data/ui/design.js

@@ -0,0 +1,239 @@
+var gstage;
+var gdir;
+
+function move_it(name,todir) {
+  $.ajax({
+    type: "PUT",
+    url: "server/" + gdir + name,
+    data: { dir: todir }
+  });
+}
+function shift_it(name,to) {
+  $.ajax({
+    type: "PUT",
+    url: "server/" + gdir + name,
+    data: { stage: to }
+  });
+}
+function rename_it(name) {
+  var newname;
+  if (newname = prompt('New name please!',name.replace(/\.xml$/,'').replace(/\.dir$/,''))) {
+    $.ajax({
+      type: "PUT",
+      url: "server/" + gdir + name,
+      data: { new: newname }
+    });
+  }
+}
+function duplicate_it(name) {
+  var newname;
+  if (newname = prompt('New name please!',name.replace(/\.xml$/,'').replace(/\.dir$/,''))) {
+    $.ajax({
+      type: "POST",
+      url: "server/" + gdir,
+      data: { new: newname, old: name }
+    });
+  }
+}
+function delete_it(name) {
+  if (confirm('Are you really, really, REALLY sure!')) {
+    $.ajax({
+      type: "DELETE",
+      url: "server/" + gdir + name
+    });
+  }
+}
+
+function es_init(gdir,gstage) {
+  var es = new EventSource('server/');
+  es.onopen = function() {
+    console.log('es open');
+  };
+  es.onmessage = function(e) {
+    paint(gdir,gstage);
+  };
+  es.onerror = function() {
+    console.log('es error');
+    // es_init();
+  };
+}
+
+function paint(gdir,gstage) {
+  $('#models tbody').empty();
+  if (gdir && gdir != '') {
+    var clone = document.importNode(document.querySelector('#up').content,true);
+    $('[data-class=name] a',clone).text('..');
+    $('[data-class=name] a',clone).attr('href',window.location.pathname + '?stage=' + gstage + '&dir=');
+    $('#models tbody').append(clone);
+  }
+  $.ajax({
+    type: "GET",
+    url: "server/" + gdir,
+    data: { stage: gstage },
+    success: function(res) {
+      $(res).each(function(k,data) {
+        if (data.type == 'dir') {
+          var clone = document.importNode(document.querySelector('#folder').content,true);
+          $('[data-class=name] a',clone).text(data['name'].replace(/\.dir$/,''));
+          $('[data-class=name]',clone).attr('data-full-name',data['name']);
+          $('[data-class=name] a',clone).attr('href',window.location.pathname + '?stage=' + gstage + '&dir=' + data['name']);
+        } else {
+          var clone = document.importNode(document.querySelector('#model').content,true);
+          $('[data-class=name] a',clone).text(data['name']);
+          $('[data-class=name]',clone).attr('data-full-name',data['name']);
+          $('[data-class=name] a',clone).attr('href','server/' + gdir + data['name'] + '/open?stage=' + gstage);
+          $('[data-class=force] a',clone).attr('href','server/' + gdir + data['name'] + '/open-new?stage=' + gstage);
+          $('[data-class=raw] a',clone).attr('href','server/' + gdir + data['name']);
+
+          $('[data-class=guarded] abbr',clone).attr('title',data['guarded'] || '');
+          $('[data-class=guarded] abbr',clone).text((data['guarded'] || '').match(/none/i) ? '' : (data['guarded'] || '').charAt(0).toUpperCase());
+          $('[data-class=resource]',clone).text(data['guarded_id'] || '');
+        }
+        $('[data-class=author]',clone).text(data['author']);
+        $('[data-class=date]',clone).text(new Date(data['date']).strftime('%Y-%m-%d, %H:%M:%S'));
+        $('#models tbody').append(clone);
+      });
+    }
+  });
+}
+
+function change_it(gdir,gstage) {
+  window.location.href = window.location.pathname + '?stage=' + gstage + '&dir=' + gdir;
+}
+
+$(document).ready(function() {
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+
+  gstage = urlParams.get('stage') || 'draft';
+  gdir = urlParams.get('dir') ? (urlParams.get('dir') + '/').replace(/\/+/,'/') : '';
+
+  es_init(gdir,gstage);
+
+  var shifts = []
+  $.ajax({
+    type: "GET",
+    url: "server/",
+    data: { stages: 'stages' },
+    success: (r) => {
+      shifts = shifts.concat(r);
+      shifts = shifts.filter(item => item !== gstage);
+    }
+  });
+
+  $('input[name=stage]').val(gstage);
+  $('input[name=dir]').val(gdir);
+  $('ui-behind span').text(gstage);
+  $('ui-behind span').click((e) => {
+    if (shifts.length > 0) {
+      var menu = {};
+      menu['Change to'] = [];
+      shifts.forEach(ele => {
+        menu['Change to'].push(
+          {
+            'label': ele,
+            'function_call': change_it,
+            'text_icon': '➔',
+            'type': undefined,
+            'class': 'capitalized',
+            'params': [gdir,ele]
+          }
+        );
+      });
+      new CustomMenu(e).contextmenu(menu);
+    }
+  });
+
+  var dragged;
+  $('#models').on('drag','td[data-class=model]',false);
+  $('#models').on('dragstart','td[data-class=model]',(e) => {
+    dragged = $(e.currentTarget).parents('tr').find('td[data-class=name]').text();
+  });
+  $('#models').on('dragover','td[data-class=folder]',false);
+  $('#models').on('drop','td[data-class=folder]',(e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (dragged) {
+      var todir = $(e.currentTarget).parents('tr').find('td[data-class=name]').text();
+      todir = todir.replace(/\./g,'');
+      if (todir != '') {
+        todir += '.dir';
+      }
+      move_it(dragged,todir);
+      dragged = undefined;
+    }
+  });
+  $('#models').on('click','td[data-class=ops]',(e) => {
+    var menu = {};
+    var name = $(e.currentTarget).parents('tr').find('td[data-class=name]').attr('data-full-name');
+    menu['Operations'] = [
+      {
+        'label': 'Delete',
+        'function_call': delete_it,
+        'text_icon': '❌',
+        'type': undefined,
+        'params': [name]
+      },
+      {
+        'label': 'Rename',
+        'function_call': rename_it,
+        'type': undefined,
+        'text_icon': '📛',
+        'params': [name]
+      }
+    ];
+    if (name.match(/\.xml$/)) {
+      menu['Operations'].unshift(
+        {
+          'label': 'Duplicate',
+          'function_call': duplicate_it,
+          'text_icon': '➕',
+          'type': undefined,
+          'params': [name]
+        }
+      );
+    }
+    if (shifts.length > 0) {
+      menu['Shifting'] = [];
+      shifts.forEach(ele => {
+        menu['Shifting'].push(
+          {
+            'label': 'Shift to ' + ele,
+            'function_call': shift_it,
+            'text_icon': '➔',
+            'type': undefined,
+            'params': [name,ele]
+          }
+        );
+      });
+    }
+    new CustomMenu(e).contextmenu(menu);
+  });
+
+  history.pushState({}, document.title, window.location.pathname + '?stage=' + gstage + '&dir=' + gdir);
+  paint(gdir,gstage);
+
+  $('#newmod').on('submit',(e) => {
+    $.ajax({
+      type: "POST",
+      url: "server/" + gdir,
+      data: { stage: gstage, new: $("#newmod input[name=new]").val() },
+      success: (r) => {
+        uidash_activate_tab($('ui-tab').first());
+      }
+    });
+    return false;
+  });
+
+  $('#newdir').on('submit',(e) => {
+    $.ajax({
+      type: "POST",
+      url: "server/",
+      data: { dir: $("#newdir input[name=newdir]").val() },
+      success: (r) => {
+        uidash_activate_tab($('ui-tab').first());
+      }
+    });
+    return false;
+  });
+});

data/ui/js/design.js

@@ -85,10 +85,9 @@ function paint(gdir,gstage) {
           $('[data-class=force] a',clone).attr('href','server/' + gdir + data['name'] + '/open-new?stage=' + gstage);
           $('[data-class=raw] a',clone).attr('href','server/' + gdir + data['name']);
 
-          console.log(data);
-          $('[data-class=guarded] abbr',clone).attr('title',data['guarded']);
-          $('[data-class=guarded] abbr',clone).text(data['guarded'].match(/none/i) ? '' : data['guarded'].charAt(0).toUpperCase());
-          $('[data-class=resource]',clone).text(data['guarded_what']);
+          $('[data-class=guarded] abbr',clone).attr('title',data['guarded'] || '');
+          $('[data-class=guarded] abbr',clone).text((data['guarded'] || '').match(/none/i) ? '' : (data['guarded'] || '').charAt(0).toUpperCase());
+          $('[data-class=resource]',clone).text(data['guarded_id'] || '');
         }
         $('[data-class=author]',clone).text(data['author']);
         $('[data-class=date]',clone).text(new Date(data['date']).strftime('%Y-%m-%d, %H:%M:%S'));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -81,6 +81,7 @@ files:
 - server/testset.xml
 - tools/cpee-moma
 - ui/css/design.css
+- ui/design.js
 - ui/index.html
 - ui/js/design.js
 homepage: http://cpee.org/