Merge pull request #11 from clearfeld/main

v0.8.1

Author: clearfeld

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "construct"
-version = "0.8.0"
+version = "0.8.1"
 description = "A GUI API Client"
 authors = ["clearfeld"]
 edition = "2021"

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://schema.tauri.app/config/2",
 	"productName": "construct",
-	"version": "0.8.0",
+	"version": "0.8.1",
 	"identifier": "com.construct.app",
 	"build": {
 		"beforeDevCommand": "pnpm dev",

src-tauri/tauri.conf.json

@@ -9,51 +9,63 @@ export default function SendRequestBtn() {
 		(state) => state.getEnabledEnvironmentAndDetails,
 	);
 
-    const setLoading = useRequestStore((state) => state.setLoading);
-    const setResponse = useRequestStore((state) => state.setResponse);
-    const setResponseHeaders = useRequestStore((state) => state.setResponseHeaders);
-    const setResponseCookies = useRequestStore((state) => state.setResponseCookies);
+	const setLoading = useRequestStore((state) => state.setLoading);
+	const setResponse = useRequestStore((state) => state.setResponse);
+	const setResponseHeaders = useRequestStore(
+		(state) => state.setResponseHeaders,
+	);
+	const setResponseCookies = useRequestStore(
+		(state) => state.setResponseCookies,
+	);
 
 	const setError = useRequestStore((state) => state.setError);
 
-	const setResponseStatusCode = useRequestStore((state) => state.setResponseStatusCode);
-
-    function ReplaceManagedVariable(env: any, sub_target: any): string {
-        console.log(env.variables);
-
-        let s = sub_target;
-        for(const variable of env.variables) {
-            console.log("VAR - ", s, variable.key, variable.initial_value, variable.current_value);
-
-            if(variable.current_value !== "") {
-                if(variable.current_value === "NULL") {
-                    s = s.replace(`{{${variable.key}}}`, "null");
-                    continue;
-                }
-
-                s = s.replace(`{{${variable.key}}}`, variable.current_value);
-            }
-
-            if(variable.initial_value !== "") {
-                if(variable.initial_value === "NULL") {
-                    s = s.replace(`{{${variable.key}}}`, "null");
-                    continue;
-                }
-
-                s = s.replace(`{{${variable.key}}}`, variable.initial_value);
-            }
+	const setResponseStatusCode = useRequestStore(
+		(state) => state.setResponseStatusCode,
+	);
 
-            // console.log(s.replace(`{{${variable.key}}}`, variable.value));
-            // s = s.replace(`{{${variable.key}}}`, variable.value);
-        }
+	function ReplaceManagedVariable(env: any, sub_target: any): string {
+		console.log(env.variables);
+
+		let s = sub_target;
+		for (const variable of env.variables) {
+			console.log(
+				"VAR - ",
+				s,
+				variable.key,
+				variable.initial_value,
+				variable.current_value,
+			);
+
+			if (variable.current_value !== "") {
+				if (variable.current_value === "NULL") {
+					s = s.replace(`{{${variable.key}}}`, "null");
+					continue;
+				}
+
+				s = s.replace(`{{${variable.key}}}`, variable.current_value);
+			}
+
+			if (variable.initial_value !== "") {
+				if (variable.initial_value === "NULL") {
+					s = s.replace(`{{${variable.key}}}`, "null");
+					continue;
+				}
+
+				s = s.replace(`{{${variable.key}}}`, variable.initial_value);
+			}
+
+			// console.log(s.replace(`{{${variable.key}}}`, variable.value));
+			// s = s.replace(`{{${variable.key}}}`, variable.value);
+		}
 
-        return s;
-    }
+		return s;
+	}
 
 	function AttemptToSendHTTPRequest() {
 		setError(null);
 		setResponse(null);
-        setLoading(true);
+		setLoading(true);
 
 		const { url, method, autoHeaders, headers, body, cookies } =
 			getHTTPRequest();
@@ -93,28 +105,33 @@ export default function SendRequestBtn() {
 
 		// console.log(trimmedUrl);
 
-        console.log("SUBBED");
-
-        let subbed_url = trimmedUrl;
-        let subbed_body = body;
-        let subbed_headers = structuredClone(headers);
-
-        subbed_url = ReplaceManagedVariable(env, subbed_url);
-        subbed_body = ReplaceManagedVariable(env, subbed_body);
-        for(let idx = 0; idx < subbed_headers.length; ++idx) {
-            subbed_headers[idx].value = ReplaceManagedVariable(env, subbed_headers[idx].value);
-        }
+		console.log("SUBBED");
+
+		let subbed_url = trimmedUrl;
+		let subbed_body = body;
+		let subbed_headers = structuredClone(headers);
+
+		if (env !== null) {
+			subbed_url = ReplaceManagedVariable(env, subbed_url);
+			subbed_body = ReplaceManagedVariable(env, subbed_body);
+			for (let idx = 0; idx < subbed_headers.length; ++idx) {
+				subbed_headers[idx].value = ReplaceManagedVariable(
+					env,
+					subbed_headers[idx].value,
+				);
+			}
+		}
 
 		const filtered_headers = subbed_headers
-        .filter((h: T_Header) => h.enabled)
-        .map((h: T_Header) => `${h.key}: ${h.value}`)
-        .join(", ");
+			.filter((h: T_Header) => h.enabled)
+			.map((h: T_Header) => `${h.key}: ${h.value}`)
+			.join(", ");
 
-        console.log("METHOD - ", method);
+		console.log("METHOD - ", method);
 		console.log("URL - ", subbed_url);
 		console.log("AUTO HEADERS - ", autoHeaders);
 		console.log("HEADERS - ", subbed_headers);
-        console.log("FILTERED HEADERS - ", filtered_headers);
+		console.log("FILTERED HEADERS - ", filtered_headers);
 		console.log("BODY - ", subbed_body);
 		console.log("COOKIES - ", cookies);
 
@@ -144,7 +161,7 @@ export default function SendRequestBtn() {
 
 				setError(eobj.error_message);
 
-                setLoading(false);
+				setLoading(false);
 			});
 
 		console.groupEnd();