cpee-model-management 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da8a1393a981789476307ef0e613545dc263312cc059d6660fb532ec89f01e4d
-  data.tar.gz: 810b7bd624babce546318e16ed0c1dda2a46332dcbb8968640db0fc0c6679e23
+  metadata.gz: 83ef7b632e188a043549854b155956023fb53dff74994c6f5c433b5fa6109662
+  data.tar.gz: d3365db939bc5ec15b5b13128684e2ce26153f99f72ae7f96016c8c3fa83dcf5
 SHA512:
-  metadata.gz: 15fbcfa24d65bae3f763963726664b74bdae9b5c4843f1121e21bd65dd78448a3325607a880483e04e046c76556ff66c7d956a857345992301c4ba1bd67943e9
-  data.tar.gz: f1836da53235376adeaef4186be11803b605a2e2f76f2bfaad71991be020bdc3663a627769f7ba7eca08d5c4246879c5430bc8beaabc93989e6ff62782eb59c7
+  metadata.gz: cc91173a38fdaba1cfc641ad04ca7d3dab86e083f0706aba4ca463eeeca769af5ebc9f0c87122d8fbe1032e7a5af6d6290f4d1e641f1aad8385cbdfdd525cdac
+  data.tar.gz: 28a16db51dfefcb19720c849a73a17fdf70709d8c3a08189c4145cb09251a3500b7c0f142a71b3c7be720ad87be77aa63c77e05e52c55b14d5185c304f2828eb

data/cpee-model-management.gemspec

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

@@ -184,7 +184,9 @@ module CPEE
         where = @a[0] == :main ? '' : @r.map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
         views = @a[1]
         models = @a[2]
-        stage = [@p[0]&.value] || ['draft']
+        templates = @a[3]
+        default_view = @a[4]
+        stage = templates.keys.include?(@p[0]&.value) ? [@p[0]&.value] : [default_view]
         stage << views[stage[0]] if views && views[stage[0]]
 
         names = Dir.glob(File.join(models,where,'*.dir')).map do |f|
@@ -206,7 +208,9 @@ module CPEE
       def response
         views = @a[0]
         models = @a[1]
-        stage = [@p[0]&.value] || ['draft']
+        templates = @a[2]
+        default_view = @a[3]
+        stage = templates.keys.include?(@p[0]&.value) ? [@p[0]&.value] : [default_view]
         stage << views[stage[0]] if views && views[stage[0]]
 
         names = Dir.glob(File.join(models,'*.dir/*.xml')).map do |f|
@@ -234,8 +238,9 @@ module CPEE
         conns = @a[1]
         themes = @a[2]
         models = @a[3]
+        default_view = @a[4]
         name  = File.basename(@r.last,'.xml')
-        nstage = @p[0].value
+        nstage = themes.keys.include?(@p[0]&.value) ? @p[0].value : default_view
         fname  = File.join(models,where,name + '.xml')
 
         dn = CPEE::ModelManagement::get_dn @h['DN']
@@ -381,9 +386,11 @@ module CPEE
         views = @a[1]
         conns = @a[2]
         templates = @a[3]
+        default_view = @a[5]
         if  @p.first.name == 'stage'
           where = @a[0] == :main ? '' : @r.map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
           stage = @p.shift.value
+          stage = templates.keys.include?(stage) ? stage : default_view
           name = @p[0].value
           source = templates[stage] ? templates[stage] : 'testset.xml'
           fname = File.join(models,where,name + '.xml')
@@ -470,7 +477,8 @@ module CPEE
         views  = @a[3]
         force  = @a[4]
         models = @a[5]
-        stage  = @p[0]&.value || 'draft'
+        default_view = @a[6]
+        stage = cock.keys.include?(@p[0]&.value) ? @p[0].value : default_view
 
         fname  = File.join(models,where,name + '.xml')
 
@@ -926,17 +934,17 @@ module CPEE
         end
 
         on resource do
-          run GetList, :main, opts[:views], opts[:models] if get 'stage'
-          run GetListFull, opts[:views], opts[:models] if get 'full'
+          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 Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
+          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'
           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] if get 'stage'
-            run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
+            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'
@@ -946,13 +954,13 @@ module CPEE
               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 Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if put 'dupdir'
-              run ShiftItem, :sub, opts[:management_receivers], opts[:themes], opts[:models] if put 'newstage'
+              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
-                run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models] if get 'stage'
+                run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models], opts[:default_view] if get 'stage'
               end
               on resource 'open-new' do
-                run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models] if get 'stage'
+                run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models], opts[:default_view] if get 'stage'
               end
             end
           end
@@ -962,13 +970,13 @@ module CPEE
             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 Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if put 'dupdir'
-            run ShiftItem, :main, opts[:management_receivers], opts[:themes], opts[:models] if put 'newstage'
+            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
-              run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models] if get 'stage'
+              run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models], opts[:default_view] if get 'stage'
             end
             on resource 'open-new' do
-              run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models] if get 'stage'
+              run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models], opts[:default_view] if get 'stage'
             end
           end
           on resource 'dash' do

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

@@ -15,9 +15,7 @@
     <parameter name="instance" mimetype="application/json"/>
   </message>
   <message name="item">
-    <parameter name="stage" type="string">
-      <xi:include href="stages"/>
-    </parameter>
+    <parameter name="stage" type="string"/>
     <parameter name="new" type="string">
       <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
     </parameter>
@@ -51,23 +49,17 @@
     <parameter name="stages" type="string"/>
   </message>
   <message name="newstage">
-    <parameter name="stage" type="string">
-      <xi:include href="stages"/>
-    </parameter>
+    <parameter name="stage" type="string"/>
   </message>
   <message name="stage">
     <optional>
-      <parameter name="stage" type="string">
-        <xi:include href="stages"/>
-      </parameter>
+      <parameter name="stage" type="string"/>
     </optional>
   </message>
   <message name="full">
     <parameter name="full" type="string"/>
     <optional>
-      <parameter name="stage" type="string">
-        <xi:include href="stages"/>
-      </parameter>
+      <parameter name="stage" type="string"/>
     </optional>
   </message>
   <message name="list">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -81,10 +81,10 @@ files:
 - lib/cpee-model-management/dashing.xml
 - lib/cpee-model-management/implementation.rb
 - lib/cpee-model-management/implementation.xml
-- lib/cpee-model-management/stages
 - server/model.xml
 - server/moma
 - server/moma.conf
+- server/redis.rdb
 - server/testset.xml
 - tools/cpee-moma
 - ui/css/moma.css

data/lib/cpee-model-management/stages

@@ -1,6 +0,0 @@
-<choice>
-  <value>draft</value>
-  <value>development</value>
-  <value>production</value>
-  <value>archive</value>
-</choice>