From 0763c1b9b8ecb17a232f88f341c74daa4541d90c Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Mon, 19 Aug 2024 19:10:08 -0700
Subject: [PATCH] Some tweaks for beta

---
 plugin-runtime-types/package.json                    |  2 +-
 .../src/gen/FindHttpResponsesRequest.ts              |  2 +-
 src-tauri/src/lib.rs                                 | 11 +++++++----
 src-tauri/yaak_plugin_runtime/src/events.rs          |  2 +-
 src-web/components/TemplateFunctionDialog.tsx        | 12 ++++++++----
 src-web/components/core/Editor/twig/extension.ts     |  4 ++--
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/plugin-runtime-types/package.json b/plugin-runtime-types/package.json
index 0bb071b2..837a1846 100644
--- a/plugin-runtime-types/package.json
+++ b/plugin-runtime-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp/api",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "main": "lib/index.js",
   "typings": "./lib/index.d.ts",
   "files": [
diff --git a/plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts b/plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts
index d34d683b..14439955 100644
--- a/plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts
+++ b/plugin-runtime-types/src/gen/FindHttpResponsesRequest.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 FindHttpResponsesRequest = { requestId: string, limit: bigint | null, };
+export type FindHttpResponsesRequest = { requestId: string, limit: number | null, };
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index e5f7af58..478aa75b 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1974,10 +1974,13 @@ async fn handle_plugin_event<R: Runtime>(
             None
         }
         InternalEventPayload::FindHttpResponsesRequest(req) => {
-            let http_responses =
-                list_http_responses(app_handle, req.request_id.as_str(), req.limit)
-                    .await
-                    .unwrap_or_default();
+            let http_responses = list_http_responses(
+                app_handle,
+                req.request_id.as_str(),
+                req.limit.map(|l| l as i64),
+            )
+            .await
+            .unwrap_or_default();
             Some(InternalEventPayload::FindHttpResponsesResponse(
                 FindHttpResponsesResponse { http_responses },
             ))
diff --git a/src-tauri/yaak_plugin_runtime/src/events.rs b/src-tauri/yaak_plugin_runtime/src/events.rs
index 2ea884cd..952d754f 100644
--- a/src-tauri/yaak_plugin_runtime/src/events.rs
+++ b/src-tauri/yaak_plugin_runtime/src/events.rs
@@ -364,7 +364,7 @@ pub struct GetHttpRequestByIdResponse {
 #[ts(export)]
 pub struct FindHttpResponsesRequest {
     pub request_id: String,
-    pub limit: Option<i64>,
+    pub limit: Option<i32>,
 }
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
diff --git a/src-web/components/TemplateFunctionDialog.tsx b/src-web/components/TemplateFunctionDialog.tsx
index a76ad0a5..346d56a4 100644
--- a/src-web/components/TemplateFunctionDialog.tsx
+++ b/src-web/components/TemplateFunctionDialog.tsx
@@ -9,6 +9,7 @@ import type {
 import { useCallback, useMemo, useState } from 'react';
 import type { FnArg } from '../gen/FnArg';
 import type { Tokens } from '../gen/Tokens';
+import { useActiveRequest } from '../hooks/useActiveRequest';
 import { useDebouncedValue } from '../hooks/useDebouncedValue';
 import { useHttpRequests } from '../hooks/useHttpRequests';
 import { useRenderTemplate } from '../hooks/useRenderTemplate';
@@ -207,6 +208,7 @@ function HttpRequestArg({
   onChange: (v: string) => void;
 }) {
   const httpRequests = useHttpRequests();
+  const activeRequest = useActiveRequest();
   return (
     <Select
       label={arg.label ?? arg.name}
@@ -214,10 +216,12 @@ function HttpRequestArg({
       onChange={onChange}
       value={value}
       options={[
-        ...httpRequests.map((r) => ({
-          label: fallbackRequestName(r),
-          value: r.id,
-        })),
+        ...httpRequests
+          .filter((r) => r.id != activeRequest?.id)
+          .map((r) => ({
+            label: fallbackRequestName(r),
+            value: r.id,
+          })),
       ]}
     />
   );
diff --git a/src-web/components/core/Editor/twig/extension.ts b/src-web/components/core/Editor/twig/extension.ts
index 0a0cc4db..1a1d5d4a 100644
--- a/src-web/components/core/Editor/twig/extension.ts
+++ b/src-web/components/core/Editor/twig/extension.ts
@@ -41,9 +41,9 @@ export function twig({
     templateFunctions.map((fn) => {
       const shortArgs =
         fn.args
-          .slice(0, 2)
+          .slice(0, 1)
           .map((a) => a.name)
-          .join(', ') + (fn.args.length > 2 ? ', …' : '');
+          .join(', ') + (fn.args.length > 1 ? ', …' : '');
       return {
         name: fn.name,
         type: 'function',