Pass render purpose to render

package-lock.json

@@ -27,7 +27,7 @@
         "@tauri-apps/plugin-log": "^2.0.0-rc.0",
         "@tauri-apps/plugin-os": "^2.0.0-rc.0",
         "@tauri-apps/plugin-shell": "^2.0.0-rc.0",
-        "@yaakapp/api": "^0.1.10",
+        "@yaakapp/api": "^0.1.11",
         "buffer": "^6.0.3",
         "classnames": "^2.3.2",
         "cm6-graphql": "^0.0.9",
@@ -2990,9 +2990,9 @@
       "integrity": "sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ=="
     },
     "node_modules/@yaakapp/api": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.1.10.tgz",
-      "integrity": "sha512-K4iV7Et+5MmE+4Eui0mu/e8Y5vlvfSyykEy6Wl2sBOg6vRqr87N+OyUs/gkct7TU07QM8zew/hbM/OTESVhQWQ==",
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.1.11.tgz",
+      "integrity": "sha512-dRZAXrQpftWygy9nJXiIYPzLA9om6reO/RiEacMe9RKqMjNG6FRF8cGmj7BcdyreizJOkH/DmcOpxn09kDD0XA==",
       "dependencies": {
         "@types/node": "^22.0.0"
       }

package.json

@@ -42,7 +42,7 @@
     "@tauri-apps/plugin-log": "^2.0.0-rc.0",
     "@tauri-apps/plugin-os": "^2.0.0-rc.0",
     "@tauri-apps/plugin-shell": "^2.0.0-rc.0",
-    "@yaakapp/api": "^0.1.10",
+    "@yaakapp/api": "^0.1.11",
     "buffer": "^6.0.3",
     "classnames": "^2.3.2",
     "cm6-graphql": "^0.0.9",

plugin-runtime-types/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@yaakapp/api",
-  "version": "0.1.7",
+  "version": "0.1.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@yaakapp/api",
-      "version": "0.1.7",
+      "version": "0.1.11",
       "dependencies": {
         "@types/node": "^22.0.0"
       },

plugin-runtime-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp/api",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "main": "lib/index.js",
   "typings": "./lib/index.d.ts",
   "files": [

plugin-runtime-types/src/gen/CallTemplateFunctionPurpose.ts

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type CallTemplateFunctionPurpose = { "type": "send" } | { "type": "preview" };
+export type CallTemplateFunctionPurpose = "send" | "preview";

scripts/vendor-plugins.cjs

@@ -1,16 +1,16 @@
-const {readdirSync, cpSync} = require("node:fs");
-const path = require("node:path");
-const {execSync} = require("node:child_process");
+const { readdirSync, cpSync } = require('node:fs');
+const path = require('node:path');
+const { execSync } = require('node:child_process');
 const pluginsDir = process.env.YAAK_PLUGINS_DIR;
 if (!pluginsDir) {
-  console.log("YAAK_PLUGINS_DIR is not set");
+  console.log('YAAK_PLUGINS_DIR is not set');
   process.exit(1);
 }
 
 console.log('Installing Yaak plugins dependencies', pluginsDir);
-execSync('npm ci', {cwd: pluginsDir});
+execSync('npm ci', { cwd: pluginsDir });
 console.log('Building Yaak plugins', pluginsDir);
-execSync('npm run build', {cwd: pluginsDir});
+execSync('npm run build', { cwd: pluginsDir });
 
 console.log('Copying Yaak plugins to', pluginsDir);
 

src-tauri/src/http_request.rs

@@ -9,6 +9,7 @@ use std::time::Duration;
 
 use crate::render::render_http_request;
 use crate::response_err;
+use crate::template_callback::PluginTemplateCallback;
 use base64::Engine;
 use http::header::{ACCEPT, USER_AGENT};
 use http::{HeaderMap, HeaderName, HeaderValue};
@@ -37,11 +38,13 @@ pub async fn send_http_request<R: Runtime>(
     let workspace = get_workspace(window, &request.workspace_id)
         .await
         .expect("Failed to get Workspace");
+    let cb = &*window.app_handle().state::<PluginTemplateCallback>();
+    let cb = cb.for_send();
     let rendered_request = render_http_request(
-        window.app_handle(),
         &request,
         &workspace,
         environment.as_ref(),
+        &cb,
     )
     .await;
 

src-tauri/src/lib.rs

@@ -2006,11 +2006,12 @@ async fn handle_plugin_event<R: Runtime>(
                 None => None,
                 Some(id) => get_environment(&w, id.as_str()).await.ok(),
             };
+            let cb = &*app_handle.state::<PluginTemplateCallback>();
             let rendered_http_request = render_http_request(
-                app_handle,
                 &req.http_request,
                 &workspace,
                 environment.as_ref(),
+                cb,
             )
             .await;
             Some(InternalEventPayload::RenderHttpRequestResponse(

src-tauri/src/render.rs

@@ -52,13 +52,12 @@ pub async fn render_grpc_request<R: Runtime>(
     }
 }
 
-pub async fn render_http_request<R: Runtime>(
-    app_handle: &AppHandle<R>,
+pub async fn render_http_request(
     r: &HttpRequest,
     w: &Workspace,
     e: Option<&Environment>,
+    cb: &PluginTemplateCallback,
 ) -> HttpRequest {
-    let cb = &*app_handle.state::<PluginTemplateCallback>();
     let vars = &variables_from_environment(w, e, cb).await;
 
     let mut url_parameters = Vec::new();

src-tauri/src/template_callback.rs

@@ -1,15 +1,24 @@
 use std::collections::HashMap;
 use tauri::{AppHandle, Manager};
+use yaak_plugin_runtime::events::CallTemplateFunctionPurpose;
 use yaak_plugin_runtime::manager::PluginManager;
 use yaak_templates::TemplateCallback;
 
+#[derive(Clone)]
 pub struct PluginTemplateCallback {
     app_handle: AppHandle,
+    purpose: CallTemplateFunctionPurpose,
 }
 
 impl PluginTemplateCallback {
     pub fn new(app_handle: AppHandle) -> PluginTemplateCallback {
-        PluginTemplateCallback { app_handle }
+        PluginTemplateCallback { app_handle, purpose: CallTemplateFunctionPurpose::Preview }
+    }
+
+    pub fn for_send(&self) -> PluginTemplateCallback {
+        let mut v = self.clone();
+        v.purpose = CallTemplateFunctionPurpose::Send;
+        v
     }
 }
 
@@ -17,7 +26,7 @@ impl TemplateCallback for PluginTemplateCallback {
     async fn run(&self, fn_name: &str, args: HashMap<String, String>) -> Result<String, String> {
         let plugin_manager = self.app_handle.state::<PluginManager>();
         let resp = plugin_manager
-            .call_template_function(fn_name, args)
+            .call_template_function(fn_name, args, self.purpose.clone())
             .await
             .map_err(|e| e.to_string())?;
         Ok(resp.unwrap_or_default())

src-tauri/yaak_plugin_runtime/src/events.rs

@@ -171,7 +171,7 @@ pub struct ShowToastRequest {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "snake_case")]
 #[ts(export)]
 pub enum ToastVariant {
     Custom,
@@ -294,7 +294,7 @@ pub struct CallTemplateFunctionArgs {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(rename_all = "snake_case", tag = "type")]
+#[serde(rename_all = "snake_case")]
 #[ts(export)]
 pub enum CallTemplateFunctionPurpose {
     Send,

src-tauri/yaak_plugin_runtime/src/manager.rs

@@ -115,11 +115,12 @@ impl PluginManager {
         &self,
         fn_name: &str,
         args: HashMap<String, String>,
+        purpose: CallTemplateFunctionPurpose,
     ) -> Result<Option<String>> {
         let req = CallTemplateFunctionRequest {
             name: fn_name.to_string(),
             args: CallTemplateFunctionArgs {
-                purpose: CallTemplateFunctionPurpose::Preview,
+                purpose,
                 values: args,
             },
         };