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

Special case Response()->response()

Browse Source
This commit is contained in:
Gregory Schier
2024-08-26 15:26:43 -07:00
parent 4b91601b98
commit badcbc7aef
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src-tauri/src/template_callback.rs
View File

@@ -27,6 +27,14 @@ impl PluginTemplateCallback {
impl TemplateCallback for PluginTemplateCallback { impl TemplateCallback for PluginTemplateCallback {
async fn run(&self, fn_name: &str, args: HashMap<String, String>) -> Result<String, String> { async fn run(&self, fn_name: &str, args: HashMap<String, String>) -> Result<String, String> {
// The beta named the function `Response` but was changed in stable.
// Keep this here for a while because there's no easy way to migrate
let fn_name = if fn_name == "Response" {
"response"
} else {
fn_name
};
let plugin_manager = self.app_handle.state::<PluginManager>(); let plugin_manager = self.app_handle.state::<PluginManager>();
let function = plugin_manager let function = plugin_manager
.get_template_functions() .get_template_functions()

10
src-web/components/core/Editor/twig/templateTags.ts
View File

@@ -81,9 +81,15 @@ function templateTags(
// TODO: Search `node.tree` instead of using Regex here // TODO: Search `node.tree` instead of using Regex here
const inner = rawTag.replace(/^\$\{\[\s*/, '').replace(/\s*]}$/, ''); const inner = rawTag.replace(/^\$\{\[\s*/, '').replace(/\s*]}$/, '');
const name = inner.match(/(\w+)[(]/)?.[1] ?? inner; let name = inner.match(/(\w+)[(]/)?.[1] ?? inner;
let option = options.find((v) => v.name === name);
// The beta named the function `Response` but was changed in stable.
// Keep this here for a while because there's no easy way to migrate
if (name === 'Response') {
name = 'response';
}
let option = options.find((v) => v.name === name);
if (option == null) { if (option == null) {
option = { option = {
invalid: true, invalid: true,