we use bags

Author: melezhik

bin/sparky-web.raku

@@ -795,9 +795,9 @@ sub create-cro-app ($pool) {
 
         }
 
-        my %group_vars = (%project-conf<group_vars> || []).map( { $_ => True } );
+        my @group_vars = %project-conf<group_vars> || [];
 
-        for (%project-conf<vars><> || []).grep({$group ?? (%group_vars{$group}:exists) !! True}) -> $v {
+        for (%project-conf<vars><> || []).grep({$group ?? @group_vars.Bag ∩ $_<group><>.Bag !! True}) -> $v {
 
         if $v<default> {
           for $v<default> ~~ m:global/"%" (\S+?) "%"/ -> $c {
@@ -880,15 +880,15 @@ sub create-cro-app ($pool) {
           http-root => sparky-http-root(),
           sparky-tcp-port => sparky-tcp-port(),
           group_vars => $group ?? [] !!  %project-conf<group_vars> || [],
-          render-vars => $group ?? True !! ( %group_vars ?? False !! True ),
+          render-vars => $group ?? True !! ( @group_vars ?? False !! True ),
           css =>css(), 
           navbar => navbar($user, $token), 
           project => $project, 
           allow-manual-run => %project-conf<allow_manual_run> || False,
           disabled => %project-conf<disabled> || False,
           project-conf-str => $project-conf-str || "configuration not found",
           project-conf => %project-conf || {},
-          vars => (%project-conf<vars> || []).grep({ $group ?? (%group_vars{$_<name>}:exists) !! True }) || [],
+          vars => (%project-conf<vars> || []).grep({$group ?? [$group].Bag ∩ $_<group><>.Bag !! True}) || [],
           scenario-code => "$root/$project/sparrowfile".IO ~~ :e ?? "$root/$project/sparrowfile".IO.slurp !! "scenario not found", 
           error => $error
         }