starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-19 15:31:19 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Handle enabled/disabled variables and render multi

Browse Source
This commit is contained in:
Gregory Schier
2023-10-28 11:36:40 -07:00
parent a44e88f53d
commit 677f436bcb
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-tauri/src/render.rs
View File

@@ -13,12 +13,18 @@ fn render_with_environment(template: &str, environment: &Environment) -> String
let mut map = HashMap::new(); let mut map = HashMap::new();
let variables = &environment.variables.0; let variables = &environment.variables.0;
for variable in variables { for variable in variables {
map.insert(variable.name.as_str(), variable.value.as_str()); if !variable.enabled {
continue;
}
map.insert(
variable.name.as_str(),
variable.value.as_str(),
);
} }
Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}") Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}")
.expect("Failed to create regex") .expect("Failed to create regex")
.replace(template, |caps: &tauri::regex::Captures| { .replace_all(template, |caps: &tauri::regex::Captures| {
let key = caps.get(1).unwrap().as_str(); let key = caps.get(1).unwrap().as_str();
map.get(key).unwrap_or(&"") map.get(key).unwrap_or(&"")
}) })

2
src-web/components/core/Editor/twig/extension.ts
View File

@@ -14,7 +14,7 @@ export function twig(
environment: Environment | null, environment: Environment | null,
autocomplete?: GenericCompletionConfig, autocomplete?: GenericCompletionConfig,
) { ) {
const variables = environment?.variables ?? []; const variables = environment?.variables.filter(v => v.enabled) ?? [];
const completions = twigCompletion({ options: variables }); const completions = twigCompletion({ options: variables });
const language = mixLanguage(base); const language = mixLanguage(base);