cpee-model-management 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ef7b632e188a043549854b155956023fb53dff74994c6f5c433b5fa6109662
-  data.tar.gz: d3365db939bc5ec15b5b13128684e2ce26153f99f72ae7f96016c8c3fa83dcf5
+  metadata.gz: '03339251b725954e976ac6be5b355b6c0c2c410fc6321af3d8b25ca7ee7b7afd'
+  data.tar.gz: 15af0705ffc8bd3dca4bd16febfeef0a6a1246249239aab7f2e8e4950c129ef9
 SHA512:
-  metadata.gz: cc91173a38fdaba1cfc641ad04ca7d3dab86e083f0706aba4ca463eeeca769af5ebc9f0c87122d8fbe1032e7a5af6d6290f4d1e641f1aad8385cbdfdd525cdac
-  data.tar.gz: 28a16db51dfefcb19720c849a73a17fdf70709d8c3a08189c4145cb09251a3500b7c0f142a71b3c7be720ad87be77aa63c77e05e52c55b14d5185c304f2828eb
+  metadata.gz: 62885ccaa6581f33b1f864845f77d7a0b8f25f004c6cb403c65309512888d40f5e960bbb4a634af330252238466b083e17a9310c60b31b93f340e6d652c90e1a
+  data.tar.gz: accb2c2d8616a9945aa78e76fefd0832c90186c0ae3538260ba179ec7d912858f0e49419ed7056e940932ca954ced728a196c54f72920d01be13328a3cdf1bda

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.2.8"
+  s.version          = "1.2.9"
   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

@@ -156,7 +156,7 @@ module CPEE
         { 'GN' => 'Christine', 'SN' => 'Ashcreek' }
       end
     end #}}}
-    def self::notify(conns,op,models,f,s=nil) #{{{
+    def self::notify(conns,op,models,f,default,s=nil) #{{{
       what = if f =~ /\.dir$/
         if  op == 'delete'
           { :op => op, :type => :dir, :name => File.basename(f) }
@@ -169,7 +169,7 @@ module CPEE
           { :op => op, :type => :file, :name => f.sub(Regexp.compile(File.join(models,'/')),'') }
         else
           attrs = JSON::load File.open(f + '.attrs')
-          fstage = attrs['design_stage'] rescue 'draft'
+          fstage = attrs['design_stage'] rescue default
           { :op => op, :type => :file, :name => f.sub(Regexp.compile(File.join(models,'/')),''), :creator => attrs['creator'], :author => attrs['author'], :stage => fstage, :date => File.mtime(f).xmlschema }
         end
       end
@@ -194,7 +194,7 @@ module CPEE
           { :type => :dir, :name => File.basename(f), :creator => attrs['creator'], :date => File.mtime(f).xmlschema }
         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'
+          fstage = attrs['design_stage'] rescue default_view
           { :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] }
 
@@ -218,7 +218,7 @@ module CPEE
           { :type => :file, :name => File.join(File.basename(File.dirname(f)),File.basename(f)), :creator => attrs['creator'], :date => File.mtime(f).xmlschema }
         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'
+          fstage = attrs['design_stage'] rescue default_view
           { :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] }
 
@@ -228,7 +228,12 @@ module CPEE
     class GetStages < Riddl::Implementation #{{{
       def response
         themes = @a[0]
-        Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(themes&.keys || []))
+        default_view = @a[1]
+        if @p[0].value == 'all'
+          Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(themes&.keys || []))
+        else
+          Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate([default_view]))
+        end
       end
     end #}}}
 
@@ -265,7 +270,7 @@ module CPEE
         File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
         CPEE::ModelManagement::op author, 'shift', models, File.join('.', where, name + '.xml'), File.join('.', where, name + '.xml')
-        CPEE::ModelManagement::notify conns, 'shift', models, fname, fname
+        CPEE::ModelManagement::notify conns, 'shift', models, fname, default_view, fname
         nil
       end
     end #}}}
@@ -279,8 +284,8 @@ module CPEE
         nname = @p[0].value
         fname  = File.join(models,where,name + '.xml')
         fnname = File.join(models,where,nname + '.xml')
+        default_view = @a[3]
         counter = 0
-        stage = 'draft'
         while File.exist?(fnname)
           counter += 1
           fnname = File.join(models,where,nname + counter.to_s + '.xml')
@@ -305,7 +310,7 @@ module CPEE
         File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
         CPEE::ModelManagement::op author, 'mv', models, File.join('.', where, File.basename(fnname)), File.join('.', where, name + '.xml')
-        CPEE::ModelManagement::notify conns, 'rename', models, fnname, fname
+        CPEE::ModelManagement::notify conns, 'rename', models, fnname, default_view, fname
         nil
       end
     end #}}}
@@ -314,6 +319,7 @@ module CPEE
         where = @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[0]
         models = @a[1]
+        default_view = @a[2]
         name  = File.join(where,File.basename(@r.last,'.dir'))
         nname = File.join(where,@p[0].value)
         fname  = File.join(models,name + '.dir')
@@ -345,7 +351,7 @@ module CPEE
         end
 
         CPEE::ModelManagement::op author, 'mv', models, File.basename(fnname), name + '.dir'
-        CPEE::ModelManagement::notify conns, 'rename', models, fnname, fname
+        CPEE::ModelManagement::notify conns, 'rename', models, fnname, default_view, fname
         nil
       end
     end #}}}
@@ -356,6 +362,7 @@ module CPEE
         name = @p[0].value
         conns = @a[1]
         models = @a[2]
+        default_view = @a[3]
 
         fname = File.join(models,where,name + '.dir')
         counter = 0
@@ -376,7 +383,7 @@ module CPEE
         File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
         CPEE::ModelManagement::op creator, 'add', models, name + '.dir'
-        CPEE::ModelManagement::notify conns, 'create', models, fname
+        CPEE::ModelManagement::notify conns, 'create', models, fname, default_view
         nil
       end
     end #}}}
@@ -450,7 +457,7 @@ module CPEE
         File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
         CPEE::ModelManagement::op creator, 'add', models, File.join('.', where, name + '.xml')
-        CPEE::ModelManagement::notify conns, 'create', models, fname
+        CPEE::ModelManagement::notify conns, 'create', models, fname, default_view
         nil
       end
     end #}}}
@@ -555,6 +562,7 @@ module CPEE
         where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[1]
         models = @a[2]
+        default_view = @a[3]
 
         name  = File.basename(@r.last,'.xml')
         to = @p[0].value
@@ -576,7 +584,7 @@ module CPEE
           File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
           CPEE::ModelManagement::op author, 'mv', models, File.join('.', to, name + '.xml'), File.join('.', where, name + '.xml')
-          CPEE::ModelManagement::notify conns, 'move', models, File.join(models,to,name + '.xml'), fname
+          CPEE::ModelManagement::notify conns, 'move', models, File.join(models,to,name + '.xml'), default_view, fname
         end
       end
     end #}}}
@@ -585,14 +593,13 @@ module CPEE
         where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[1]
         models = @a[2]
+        default_view = @a[3]
         name  = File.basename(@r.last,'.xml')
         cont = @p[0].value.read
         dn = CPEE::ModelManagement::get_dn @h['DN']
 
         fname = File.join(models,where,name + '.xml')
 
-        p fname
-
         if File.exist?(fname)
           author = dn['GN'] + ' ' + dn['SN']
           attrs = {}
@@ -602,10 +609,10 @@ module CPEE
               ele.text = dn['GN'] + ' ' + dn['SN']
             end
             if doc.find('/p:testset/p:attributes/p:design_stage').empty?
-              doc.find('/p:testset/p:attributes').first.add('p:design_stage','draft')
+              doc.find('/p:testset/p:attributes').first.add('p:design_stage',default_view)
             else
               doc.find('/p:testset/p:attributes/p:design_stage').each do |ele|
-                ele.text = 'draft' if ele.text.strip == ''
+                ele.text = default_view if ele.text.strip == ''
               end
             end
             attrs = doc.find('/p:testset/p:attributes/*').map do |e|
@@ -615,7 +622,7 @@ module CPEE
           end
           File.write(fname + '.attrs',JSON::pretty_generate(attrs))
           CPEE::ModelManagement::op author, 'add', models, File.join('.', where, name + '.xml')
-          CPEE::ModelManagement::notify conns, 'put', models, fname
+          CPEE::ModelManagement::notify conns, 'put', models, fname, default_view
         else
           @status = 400
         end
@@ -626,6 +633,7 @@ module CPEE
         where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[1]
         models = @a[2]
+        default_view = @a[3]
         name  = File.basename(@r.last,'.xml')
         fname = File.join(models,where,name + '.xml')
 
@@ -633,7 +641,7 @@ module CPEE
         author = dn['GN'] + ' ' + dn['SN']
 
         CPEE::ModelManagement::op author, 'rm', models, File.join('.', where, name + '.xml')
-        CPEE::ModelManagement::notify conns, 'delete', models, fname
+        CPEE::ModelManagement::notify conns, 'delete', models, fname, default_view
       end
     end #}}}
     class DeleteDir < Riddl::Implementation #{{{
@@ -641,6 +649,7 @@ module CPEE
         where = @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         conns = @a[0]
         models = @a[1]
+        default_view = @a[2]
         name  = File.basename(@r.last,'.dir')
         fname = File.join(models,where,name + '.dir')
 
@@ -648,7 +657,7 @@ module CPEE
         author = dn['GN'] + ' ' + dn['SN']
 
         CPEE::ModelManagement::op author, 'rm', models, File.join(where,name + '.dir')
-        CPEE::ModelManagement::notify conns, 'delete', models, fname
+        CPEE::ModelManagement::notify conns, 'delete', models, fname, default_view
       end
     end #}}}
 
@@ -910,6 +919,9 @@ module CPEE
       opts[:sse_keepalive_frequency]    ||= 10
 
       CPEE::redis_connect opts, 'Server Main'
+
+      opts[:default_view] ||= opts[:themes]&.first&.first || 'undefined'
+
       Proc.new do
 
         parallel do
@@ -936,24 +948,24 @@ module CPEE
         on resource do
           run GetList, :main, opts[:views], opts[:models], opts[:templates], opts[:default_view] if get 'stage'
           run GetListFull, opts[:views], opts[:models], opts[:templates], opts[:default_view] if get 'full'
-          run GetStages, opts[:themes] if get 'stages'
+          run GetStages, opts[:themes], opts[:default_view] if get 'stages'
           run Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view] if post 'item'
-          run CreateDir, :main, opts[:management_receivers], opts[:models] if post 'dir'
+          run CreateDir, :main, opts[:management_receivers], opts[:models], opts[:default_view] if post 'dir'
           on resource 'management' do
             run ManagementSend, opts[:management_receivers] if sse
           end
           on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.dir' do
             run GetList, :sub, opts[:views], opts[:models], opts[:templates], opts[:default_view] if get 'stage'
-            run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view]if post 'item'
-            run DeleteDir, opts[:management_receivers], opts[:models] if delete
-            run RenameDir, opts[:management_receivers], opts[:models] if put 'name'
-            run CreateDir, :sub, opts[:management_receivers], opts[:models] if post 'dir'
+            run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view] if post 'item'
+            run DeleteDir, opts[:management_receivers], opts[:models], opts[:default_view] if delete
+            run RenameDir, opts[:management_receivers], opts[:models], opts[:default_view] if put 'name'
+            run CreateDir, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if post 'dir'
             on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.xml' do
-              run DeleteItem, :sub, opts[:management_receivers], opts[:models] if delete
+              run DeleteItem, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if delete
               run GetItem, :sub, opts[:models] if get
-              run PutItem, :sub, opts[:management_receivers], opts[:models] if put 'content'
-              run RenameItem, :sub, opts[:management_receivers], opts[:models] if put 'name'
-              run MoveItem, :sub, opts[:management_receivers], opts[:models] if put 'movedir'
+              run PutItem, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if put 'content'
+              run RenameItem, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if put 'name'
+              run MoveItem, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if put 'movedir'
               run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view]if put 'dupdir'
               run ShiftItem, :sub, opts[:management_receivers], opts[:themes], opts[:models], opts[:default_view] if put 'newstage'
               on resource 'open' do
@@ -965,11 +977,11 @@ module CPEE
             end
           end
           on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.xml' do
-            run DeleteItem, :main, opts[:management_receivers], opts[:models] if delete
+            run DeleteItem, :main, opts[:management_receivers], opts[:models], opts[:default_view] if delete
             run GetItem, :main, opts[:models] if get
-            run PutItem, :main, opts[:management_receivers], opts[:models] if put 'content'
-            run RenameItem, :main, opts[:management_receivers], opts[:models] if put 'name'
-            run MoveItem, :main, opts[:management_receivers], opts[:models] if put 'movedir'
+            run PutItem, :main, opts[:management_receivers], opts[:models], opts[:default_view] if put 'content'
+            run RenameItem, :main, opts[:management_receivers], opts[:models], opts[:default_view] if put 'name'
+            run MoveItem, :main, opts[:management_receivers], opts[:models], opts[:default_view] if put 'movedir'
             run Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view]if put 'dupdir'
             run ShiftItem, :main, opts[:management_receivers], opts[:themes], opts[:models], opts[:default_view] if put 'newstage'
             on resource 'open' do

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

@@ -46,7 +46,12 @@
     </optional  >
   </message>
   <message name="stages">
-    <parameter name="stages" type="string"/>
+    <parameter name="stages" type="string">
+      <choice>
+        <value>all</value>
+        <value>default</value>
+      </choice>
+    </parameter>
   </message>
   <message name="newstage">
     <parameter name="stage" type="string"/>

data/ui/js/moma.js

@@ -195,28 +195,47 @@ $(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') + '/').replaceAll(/\/+/g,'/') : '';
-
-  moma_init();
-
   var shifts = []
+  var default_view;
+
   $.ajax({
     type: "GET",
     url: "server/",
-    data: { stages: 'stages' },
+    data: { stages: 'default' },
     success: (r) => {
-      shifts = shifts.concat(r);
-      shifts = shifts.filter(item => item !== gstage);
+      default_view = r[0];
+      console.log(default_view);
+
+      gstage = urlParams.get('stage') || default_view;
+      gdir = urlParams.get('dir') ? (urlParams.get('dir') + '/').replaceAll(/\/+/g,'/') : '';
+
+      moma_init();
+
+      $('ui-behind span').text(gstage);
+
+      paint(gdir,gstage);
+      setInterval(possibly_paint,1000);
+
+      $.ajax({
+        type: "GET",
+        url: "server/",
+        data: { stages: 'all' },
+        success: (r) => {
+          shifts = shifts.concat(r);
+          shifts = shifts.filter(item => item !== gstage);
+          if (shifts.length == 0) {
+            $('ui-behind span').hide();
+          }
+        }
+      });
     }
   });
 
   window.onpopstate = function(e){
-    let d = e.state || { gstage: 'draft', 'gdir': '' };
+    let d = e.state || { gstage: default_view, 'gdir': '' };
     paint(d.gdir,d.gstage,false);
   };
 
-  $('ui-behind span').text(gstage);
   $('ui-behind span').click((e) => {
     if (shifts.length > 0) {
       var menu = {};
@@ -349,8 +368,6 @@ $(document).ready(function() {
     new CustomMenu(e).contextmenu(menu);
   });
 
-  paint(gdir,gstage);
-
   $('#newmod').on('submit',(e) => {
     $.ajax({
       type: "POST",
@@ -374,6 +391,4 @@ $(document).ready(function() {
     });
     return false;
   });
-
-  setInterval(possibly_paint,1000);
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Juergen eTM Mangler