cpee-model-management 1.2.7 → 1.2.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: da8a1393a981789476307ef0e613545dc263312cc059d6660fb532ec89f01e4d
4
- data.tar.gz: 810b7bd624babce546318e16ed0c1dda2a46332dcbb8968640db0fc0c6679e23
3
+ metadata.gz: '03339251b725954e976ac6be5b355b6c0c2c410fc6321af3d8b25ca7ee7b7afd'
4
+ data.tar.gz: 15af0705ffc8bd3dca4bd16febfeef0a6a1246249239aab7f2e8e4950c129ef9
5
5
  SHA512:
6
- metadata.gz: 15fbcfa24d65bae3f763963726664b74bdae9b5c4843f1121e21bd65dd78448a3325607a880483e04e046c76556ff66c7d956a857345992301c4ba1bd67943e9
7
- data.tar.gz: f1836da53235376adeaef4186be11803b605a2e2f76f2bfaad71991be020bdc3663a627769f7ba7eca08d5c4246879c5430bc8beaabc93989e6ff62782eb59c7
6
+ metadata.gz: 62885ccaa6581f33b1f864845f77d7a0b8f25f004c6cb403c65309512888d40f5e960bbb4a634af330252238466b083e17a9310c60b31b93f340e6d652c90e1a
7
+ data.tar.gz: accb2c2d8616a9945aa78e76fefd0832c90186c0ae3538260ba179ec7d912858f0e49419ed7056e940932ca954ced728a196c54f72920d01be13328a3cdf1bda
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee-model-management"
3
- s.version = "1.2.7"
3
+ s.version = "1.2.9"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0"
6
6
  s.summary = "(Lifecycle) manage your process models in a directory or git repo."
@@ -156,7 +156,7 @@ module CPEE
156
156
  { 'GN' => 'Christine', 'SN' => 'Ashcreek' }
157
157
  end
158
158
  end #}}}
159
- def self::notify(conns,op,models,f,s=nil) #{{{
159
+ def self::notify(conns,op,models,f,default,s=nil) #{{{
160
160
  what = if f =~ /\.dir$/
161
161
  if op == 'delete'
162
162
  { :op => op, :type => :dir, :name => File.basename(f) }
@@ -169,7 +169,7 @@ module CPEE
169
169
  { :op => op, :type => :file, :name => f.sub(Regexp.compile(File.join(models,'/')),'') }
170
170
  else
171
171
  attrs = JSON::load File.open(f + '.attrs')
172
- fstage = attrs['design_stage'] rescue 'draft'
172
+ fstage = attrs['design_stage'] rescue default
173
173
  { :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 }
174
174
  end
175
175
  end
@@ -184,7 +184,9 @@ module CPEE
184
184
  where = @a[0] == :main ? '' : @r.map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
185
185
  views = @a[1]
186
186
  models = @a[2]
187
- stage = [@p[0]&.value] || ['draft']
187
+ templates = @a[3]
188
+ default_view = @a[4]
189
+ stage = templates.keys.include?(@p[0]&.value) ? [@p[0]&.value] : [default_view]
188
190
  stage << views[stage[0]] if views && views[stage[0]]
189
191
 
190
192
  names = Dir.glob(File.join(models,where,'*.dir')).map do |f|
@@ -192,7 +194,7 @@ module CPEE
192
194
  { :type => :dir, :name => File.basename(f), :creator => attrs['creator'], :date => File.mtime(f).xmlschema }
193
195
  end.compact.uniq.sort_by{ |e| e[:name] } + Dir.glob(File.join(models,where,'*.xml')).map do |f|
194
196
  attrs = JSON::load File.open(f + '.attrs')
195
- fstage = attrs['design_stage'] rescue 'draft'
197
+ fstage = attrs['design_stage'] rescue default_view
196
198
  { :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)
197
199
  end.compact.uniq.sort_by{ |e| e[:name] }
198
200
 
@@ -206,7 +208,9 @@ module CPEE
206
208
  def response
207
209
  views = @a[0]
208
210
  models = @a[1]
209
- stage = [@p[0]&.value] || ['draft']
211
+ templates = @a[2]
212
+ default_view = @a[3]
213
+ stage = templates.keys.include?(@p[0]&.value) ? [@p[0]&.value] : [default_view]
210
214
  stage << views[stage[0]] if views && views[stage[0]]
211
215
 
212
216
  names = Dir.glob(File.join(models,'*.dir/*.xml')).map do |f|
@@ -214,7 +218,7 @@ module CPEE
214
218
  { :type => :file, :name => File.join(File.basename(File.dirname(f)),File.basename(f)), :creator => attrs['creator'], :date => File.mtime(f).xmlschema }
215
219
  end.compact.uniq.sort_by{ |e| e[:name] } + Dir.glob(File.join(models,'*.xml')).map do |f|
216
220
  attrs = JSON::load File.open(f + '.attrs')
217
- fstage = attrs['design_stage'] rescue 'draft'
221
+ fstage = attrs['design_stage'] rescue default_view
218
222
  { :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)
219
223
  end.compact.uniq.sort_by{ |e| e[:name] }
220
224
 
@@ -224,7 +228,12 @@ module CPEE
224
228
  class GetStages < Riddl::Implementation #{{{
225
229
  def response
226
230
  themes = @a[0]
227
- Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(themes&.keys || []))
231
+ default_view = @a[1]
232
+ if @p[0].value == 'all'
233
+ Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(themes&.keys || []))
234
+ else
235
+ Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate([default_view]))
236
+ end
228
237
  end
229
238
  end #}}}
230
239
 
@@ -234,8 +243,9 @@ module CPEE
234
243
  conns = @a[1]
235
244
  themes = @a[2]
236
245
  models = @a[3]
246
+ default_view = @a[4]
237
247
  name = File.basename(@r.last,'.xml')
238
- nstage = @p[0].value
248
+ nstage = themes.keys.include?(@p[0]&.value) ? @p[0].value : default_view
239
249
  fname = File.join(models,where,name + '.xml')
240
250
 
241
251
  dn = CPEE::ModelManagement::get_dn @h['DN']
@@ -260,7 +270,7 @@ module CPEE
260
270
  File.write(fname + '.attrs',JSON::pretty_generate(attrs))
261
271
 
262
272
  CPEE::ModelManagement::op author, 'shift', models, File.join('.', where, name + '.xml'), File.join('.', where, name + '.xml')
263
- CPEE::ModelManagement::notify conns, 'shift', models, fname, fname
273
+ CPEE::ModelManagement::notify conns, 'shift', models, fname, default_view, fname
264
274
  nil
265
275
  end
266
276
  end #}}}
@@ -274,8 +284,8 @@ module CPEE
274
284
  nname = @p[0].value
275
285
  fname = File.join(models,where,name + '.xml')
276
286
  fnname = File.join(models,where,nname + '.xml')
287
+ default_view = @a[3]
277
288
  counter = 0
278
- stage = 'draft'
279
289
  while File.exist?(fnname)
280
290
  counter += 1
281
291
  fnname = File.join(models,where,nname + counter.to_s + '.xml')
@@ -300,7 +310,7 @@ module CPEE
300
310
  File.write(fname + '.attrs',JSON::pretty_generate(attrs))
301
311
 
302
312
  CPEE::ModelManagement::op author, 'mv', models, File.join('.', where, File.basename(fnname)), File.join('.', where, name + '.xml')
303
- CPEE::ModelManagement::notify conns, 'rename', models, fnname, fname
313
+ CPEE::ModelManagement::notify conns, 'rename', models, fnname, default_view, fname
304
314
  nil
305
315
  end
306
316
  end #}}}
@@ -309,6 +319,7 @@ module CPEE
309
319
  where = @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
310
320
  conns = @a[0]
311
321
  models = @a[1]
322
+ default_view = @a[2]
312
323
  name = File.join(where,File.basename(@r.last,'.dir'))
313
324
  nname = File.join(where,@p[0].value)
314
325
  fname = File.join(models,name + '.dir')
@@ -340,7 +351,7 @@ module CPEE
340
351
  end
341
352
 
342
353
  CPEE::ModelManagement::op author, 'mv', models, File.basename(fnname), name + '.dir'
343
- CPEE::ModelManagement::notify conns, 'rename', models, fnname, fname
354
+ CPEE::ModelManagement::notify conns, 'rename', models, fnname, default_view, fname
344
355
  nil
345
356
  end
346
357
  end #}}}
@@ -351,6 +362,7 @@ module CPEE
351
362
  name = @p[0].value
352
363
  conns = @a[1]
353
364
  models = @a[2]
365
+ default_view = @a[3]
354
366
 
355
367
  fname = File.join(models,where,name + '.dir')
356
368
  counter = 0
@@ -371,7 +383,7 @@ module CPEE
371
383
  File.write(fname + '.attrs',JSON::pretty_generate(attrs))
372
384
 
373
385
  CPEE::ModelManagement::op creator, 'add', models, name + '.dir'
374
- CPEE::ModelManagement::notify conns, 'create', models, fname
386
+ CPEE::ModelManagement::notify conns, 'create', models, fname, default_view
375
387
  nil
376
388
  end
377
389
  end #}}}
@@ -381,9 +393,11 @@ module CPEE
381
393
  views = @a[1]
382
394
  conns = @a[2]
383
395
  templates = @a[3]
396
+ default_view = @a[5]
384
397
  if @p.first.name == 'stage'
385
398
  where = @a[0] == :main ? '' : @r.map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
386
399
  stage = @p.shift.value
400
+ stage = templates.keys.include?(stage) ? stage : default_view
387
401
  name = @p[0].value
388
402
  source = templates[stage] ? templates[stage] : 'testset.xml'
389
403
  fname = File.join(models,where,name + '.xml')
@@ -443,7 +457,7 @@ module CPEE
443
457
  File.write(fname + '.attrs',JSON::pretty_generate(attrs))
444
458
 
445
459
  CPEE::ModelManagement::op creator, 'add', models, File.join('.', where, name + '.xml')
446
- CPEE::ModelManagement::notify conns, 'create', models, fname
460
+ CPEE::ModelManagement::notify conns, 'create', models, fname, default_view
447
461
  nil
448
462
  end
449
463
  end #}}}
@@ -470,7 +484,8 @@ module CPEE
470
484
  views = @a[3]
471
485
  force = @a[4]
472
486
  models = @a[5]
473
- stage = @p[0]&.value || 'draft'
487
+ default_view = @a[6]
488
+ stage = cock.keys.include?(@p[0]&.value) ? @p[0].value : default_view
474
489
 
475
490
  fname = File.join(models,where,name + '.xml')
476
491
 
@@ -547,6 +562,7 @@ module CPEE
547
562
  where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
548
563
  conns = @a[1]
549
564
  models = @a[2]
565
+ default_view = @a[3]
550
566
 
551
567
  name = File.basename(@r.last,'.xml')
552
568
  to = @p[0].value
@@ -568,7 +584,7 @@ module CPEE
568
584
  File.write(fname + '.attrs',JSON::pretty_generate(attrs))
569
585
 
570
586
  CPEE::ModelManagement::op author, 'mv', models, File.join('.', to, name + '.xml'), File.join('.', where, name + '.xml')
571
- CPEE::ModelManagement::notify conns, 'move', models, File.join(models,to,name + '.xml'), fname
587
+ CPEE::ModelManagement::notify conns, 'move', models, File.join(models,to,name + '.xml'), default_view, fname
572
588
  end
573
589
  end
574
590
  end #}}}
@@ -577,14 +593,13 @@ module CPEE
577
593
  where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
578
594
  conns = @a[1]
579
595
  models = @a[2]
596
+ default_view = @a[3]
580
597
  name = File.basename(@r.last,'.xml')
581
598
  cont = @p[0].value.read
582
599
  dn = CPEE::ModelManagement::get_dn @h['DN']
583
600
 
584
601
  fname = File.join(models,where,name + '.xml')
585
602
 
586
- p fname
587
-
588
603
  if File.exist?(fname)
589
604
  author = dn['GN'] + ' ' + dn['SN']
590
605
  attrs = {}
@@ -594,10 +609,10 @@ module CPEE
594
609
  ele.text = dn['GN'] + ' ' + dn['SN']
595
610
  end
596
611
  if doc.find('/p:testset/p:attributes/p:design_stage').empty?
597
- doc.find('/p:testset/p:attributes').first.add('p:design_stage','draft')
612
+ doc.find('/p:testset/p:attributes').first.add('p:design_stage',default_view)
598
613
  else
599
614
  doc.find('/p:testset/p:attributes/p:design_stage').each do |ele|
600
- ele.text = 'draft' if ele.text.strip == ''
615
+ ele.text = default_view if ele.text.strip == ''
601
616
  end
602
617
  end
603
618
  attrs = doc.find('/p:testset/p:attributes/*').map do |e|
@@ -607,7 +622,7 @@ module CPEE
607
622
  end
608
623
  File.write(fname + '.attrs',JSON::pretty_generate(attrs))
609
624
  CPEE::ModelManagement::op author, 'add', models, File.join('.', where, name + '.xml')
610
- CPEE::ModelManagement::notify conns, 'put', models, fname
625
+ CPEE::ModelManagement::notify conns, 'put', models, fname, default_view
611
626
  else
612
627
  @status = 400
613
628
  end
@@ -618,6 +633,7 @@ module CPEE
618
633
  where = @a[0] == :main ? '' : @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
619
634
  conns = @a[1]
620
635
  models = @a[2]
636
+ default_view = @a[3]
621
637
  name = File.basename(@r.last,'.xml')
622
638
  fname = File.join(models,where,name + '.xml')
623
639
 
@@ -625,7 +641,7 @@ module CPEE
625
641
  author = dn['GN'] + ' ' + dn['SN']
626
642
 
627
643
  CPEE::ModelManagement::op author, 'rm', models, File.join('.', where, name + '.xml')
628
- CPEE::ModelManagement::notify conns, 'delete', models, fname
644
+ CPEE::ModelManagement::notify conns, 'delete', models, fname, default_view
629
645
  end
630
646
  end #}}}
631
647
  class DeleteDir < Riddl::Implementation #{{{
@@ -633,6 +649,7 @@ module CPEE
633
649
  where = @r[0..-2].map{ |d| Riddl::Protocols::Utils::unescape(d) }.join('/')
634
650
  conns = @a[0]
635
651
  models = @a[1]
652
+ default_view = @a[2]
636
653
  name = File.basename(@r.last,'.dir')
637
654
  fname = File.join(models,where,name + '.dir')
638
655
 
@@ -640,7 +657,7 @@ module CPEE
640
657
  author = dn['GN'] + ' ' + dn['SN']
641
658
 
642
659
  CPEE::ModelManagement::op author, 'rm', models, File.join(where,name + '.dir')
643
- CPEE::ModelManagement::notify conns, 'delete', models, fname
660
+ CPEE::ModelManagement::notify conns, 'delete', models, fname, default_view
644
661
  end
645
662
  end #}}}
646
663
 
@@ -902,6 +919,9 @@ module CPEE
902
919
  opts[:sse_keepalive_frequency] ||= 10
903
920
 
904
921
  CPEE::redis_connect opts, 'Server Main'
922
+
923
+ opts[:default_view] ||= opts[:themes]&.first&.first || 'undefined'
924
+
905
925
  Proc.new do
906
926
 
907
927
  parallel do
@@ -926,49 +946,49 @@ module CPEE
926
946
  end
927
947
 
928
948
  on resource do
929
- run GetList, :main, opts[:views], opts[:models] if get 'stage'
930
- run GetListFull, opts[:views], opts[:models] if get 'full'
931
- run GetStages, opts[:themes] if get 'stages'
932
- run Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
933
- run CreateDir, :main, opts[:management_receivers], opts[:models] if post 'dir'
949
+ run GetList, :main, opts[:views], opts[:models], opts[:templates], opts[:default_view] if get 'stage'
950
+ run GetListFull, opts[:views], opts[:models], opts[:templates], opts[:default_view] if get 'full'
951
+ run GetStages, opts[:themes], opts[:default_view] if get 'stages'
952
+ run Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view] if post 'item'
953
+ run CreateDir, :main, opts[:management_receivers], opts[:models], opts[:default_view] if post 'dir'
934
954
  on resource 'management' do
935
955
  run ManagementSend, opts[:management_receivers] if sse
936
956
  end
937
957
  on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.dir' do
938
- run GetList, :sub, opts[:views], opts[:models] if get 'stage'
939
- run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
940
- run DeleteDir, opts[:management_receivers], opts[:models] if delete
941
- run RenameDir, opts[:management_receivers], opts[:models] if put 'name'
942
- run CreateDir, :sub, opts[:management_receivers], opts[:models] if post 'dir'
958
+ run GetList, :sub, opts[:views], opts[:models], opts[:templates], opts[:default_view] if get 'stage'
959
+ run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view] if post 'item'
960
+ run DeleteDir, opts[:management_receivers], opts[:models], opts[:default_view] if delete
961
+ run RenameDir, opts[:management_receivers], opts[:models], opts[:default_view] if put 'name'
962
+ run CreateDir, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if post 'dir'
943
963
  on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.xml' do
944
- run DeleteItem, :sub, opts[:management_receivers], opts[:models] if delete
964
+ run DeleteItem, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if delete
945
965
  run GetItem, :sub, opts[:models] if get
946
- run PutItem, :sub, opts[:management_receivers], opts[:models] if put 'content'
947
- run RenameItem, :sub, opts[:management_receivers], opts[:models] if put 'name'
948
- run MoveItem, :sub, opts[:management_receivers], opts[:models] if put 'movedir'
949
- run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if put 'dupdir'
950
- run ShiftItem, :sub, opts[:management_receivers], opts[:themes], opts[:models] if put 'newstage'
966
+ run PutItem, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if put 'content'
967
+ run RenameItem, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if put 'name'
968
+ run MoveItem, :sub, opts[:management_receivers], opts[:models], opts[:default_view] if put 'movedir'
969
+ run Create, :sub, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view]if put 'dupdir'
970
+ run ShiftItem, :sub, opts[:management_receivers], opts[:themes], opts[:models], opts[:default_view] if put 'newstage'
951
971
  on resource 'open' do
952
- run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models] if get 'stage'
972
+ run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models], opts[:default_view] if get 'stage'
953
973
  end
954
974
  on resource 'open-new' do
955
- run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models] if get 'stage'
975
+ run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models], opts[:default_view] if get 'stage'
956
976
  end
957
977
  end
958
978
  end
959
979
  on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.xml' do
960
- run DeleteItem, :main, opts[:management_receivers], opts[:models] if delete
980
+ run DeleteItem, :main, opts[:management_receivers], opts[:models], opts[:default_view] if delete
961
981
  run GetItem, :main, opts[:models] if get
962
- run PutItem, :main, opts[:management_receivers], opts[:models] if put 'content'
963
- run RenameItem, :main, opts[:management_receivers], opts[:models] if put 'name'
964
- run MoveItem, :main, opts[:management_receivers], opts[:models] if put 'movedir'
965
- run Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if put 'dupdir'
966
- run ShiftItem, :main, opts[:management_receivers], opts[:themes], opts[:models] if put 'newstage'
982
+ run PutItem, :main, opts[:management_receivers], opts[:models], opts[:default_view] if put 'content'
983
+ run RenameItem, :main, opts[:management_receivers], opts[:models], opts[:default_view] if put 'name'
984
+ run MoveItem, :main, opts[:management_receivers], opts[:models], opts[:default_view] if put 'movedir'
985
+ run Create, :main, opts[:views], opts[:management_receivers], opts[:templates], opts[:models], opts[:default_view]if put 'dupdir'
986
+ run ShiftItem, :main, opts[:management_receivers], opts[:themes], opts[:models], opts[:default_view] if put 'newstage'
967
987
  on resource 'open' do
968
- run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models] if get 'stage'
988
+ run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models], opts[:default_view] if get 'stage'
969
989
  end
970
990
  on resource 'open-new' do
971
- run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models] if get 'stage'
991
+ run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models], opts[:default_view] if get 'stage'
972
992
  end
973
993
  end
974
994
  on resource 'dash' do
@@ -15,9 +15,7 @@
15
15
  <parameter name="instance" mimetype="application/json"/>
16
16
  </message>
17
17
  <message name="item">
18
- <parameter name="stage" type="string">
19
- <xi:include href="stages"/>
20
- </parameter>
18
+ <parameter name="stage" type="string"/>
21
19
  <parameter name="new" type="string">
22
20
  <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
23
21
  </parameter>
@@ -48,26 +46,25 @@
48
46
  </optional >
49
47
  </message>
50
48
  <message name="stages">
51
- <parameter name="stages" type="string"/>
49
+ <parameter name="stages" type="string">
50
+ <choice>
51
+ <value>all</value>
52
+ <value>default</value>
53
+ </choice>
54
+ </parameter>
52
55
  </message>
53
56
  <message name="newstage">
54
- <parameter name="stage" type="string">
55
- <xi:include href="stages"/>
56
- </parameter>
57
+ <parameter name="stage" type="string"/>
57
58
  </message>
58
59
  <message name="stage">
59
60
  <optional>
60
- <parameter name="stage" type="string">
61
- <xi:include href="stages"/>
62
- </parameter>
61
+ <parameter name="stage" type="string"/>
63
62
  </optional>
64
63
  </message>
65
64
  <message name="full">
66
65
  <parameter name="full" type="string"/>
67
66
  <optional>
68
- <parameter name="stage" type="string">
69
- <xi:include href="stages"/>
70
- </parameter>
67
+ <parameter name="stage" type="string"/>
71
68
  </optional>
72
69
  </message>
73
70
  <message name="list">
data/server/redis.rdb ADDED
Binary file
data/ui/js/moma.js CHANGED
@@ -195,28 +195,47 @@ $(document).ready(function() {
195
195
  const queryString = window.location.search;
196
196
  const urlParams = new URLSearchParams(queryString);
197
197
 
198
- gstage = urlParams.get('stage') || 'draft';
199
- gdir = urlParams.get('dir') ? (urlParams.get('dir') + '/').replaceAll(/\/+/g,'/') : '';
200
-
201
- moma_init();
202
-
203
198
  var shifts = []
199
+ var default_view;
200
+
204
201
  $.ajax({
205
202
  type: "GET",
206
203
  url: "server/",
207
- data: { stages: 'stages' },
204
+ data: { stages: 'default' },
208
205
  success: (r) => {
209
- shifts = shifts.concat(r);
210
- shifts = shifts.filter(item => item !== gstage);
206
+ default_view = r[0];
207
+ console.log(default_view);
208
+
209
+ gstage = urlParams.get('stage') || default_view;
210
+ gdir = urlParams.get('dir') ? (urlParams.get('dir') + '/').replaceAll(/\/+/g,'/') : '';
211
+
212
+ moma_init();
213
+
214
+ $('ui-behind span').text(gstage);
215
+
216
+ paint(gdir,gstage);
217
+ setInterval(possibly_paint,1000);
218
+
219
+ $.ajax({
220
+ type: "GET",
221
+ url: "server/",
222
+ data: { stages: 'all' },
223
+ success: (r) => {
224
+ shifts = shifts.concat(r);
225
+ shifts = shifts.filter(item => item !== gstage);
226
+ if (shifts.length == 0) {
227
+ $('ui-behind span').hide();
228
+ }
229
+ }
230
+ });
211
231
  }
212
232
  });
213
233
 
214
234
  window.onpopstate = function(e){
215
- let d = e.state || { gstage: 'draft', 'gdir': '' };
235
+ let d = e.state || { gstage: default_view, 'gdir': '' };
216
236
  paint(d.gdir,d.gstage,false);
217
237
  };
218
238
 
219
- $('ui-behind span').text(gstage);
220
239
  $('ui-behind span').click((e) => {
221
240
  if (shifts.length > 0) {
222
241
  var menu = {};
@@ -349,8 +368,6 @@ $(document).ready(function() {
349
368
  new CustomMenu(e).contextmenu(menu);
350
369
  });
351
370
 
352
- paint(gdir,gstage);
353
-
354
371
  $('#newmod').on('submit',(e) => {
355
372
  $.ajax({
356
373
  type: "POST",
@@ -374,6 +391,4 @@ $(document).ready(function() {
374
391
  });
375
392
  return false;
376
393
  });
377
-
378
- setInterval(possibly_paint,1000);
379
394
  });
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cpee-model-management
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.7
4
+ version: 1.2.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -81,10 +81,10 @@ files:
81
81
  - lib/cpee-model-management/dashing.xml
82
82
  - lib/cpee-model-management/implementation.rb
83
83
  - lib/cpee-model-management/implementation.xml
84
- - lib/cpee-model-management/stages
85
84
  - server/model.xml
86
85
  - server/moma
87
86
  - server/moma.conf
87
+ - server/redis.rdb
88
88
  - server/testset.xml
89
89
  - tools/cpee-moma
90
90
  - ui/css/moma.css
@@ -1,6 +0,0 @@
1
- <choice>
2
- <value>draft</value>
3
- <value>development</value>
4
- <value>production</value>
5
- <value>archive</value>
6
- </choice>