Fixed some routing and introspection requests

src-tauri/src/main.rs

@@ -83,9 +83,13 @@ async fn actually_send_ephemeral_request(
     let environments = find_environments(&request.workspace_id, pool)
         .await
         .expect("Failed to find environments");
-    let environment: models::Environment = environments.first().unwrap().clone();
 
-    let mut url_string = render::render(&request.url, environment.clone());
+    // TODO: Use active environment
+    let environment = environments.first();
+    let mut url_string = match environment {
+        Some(e) => render::render(&request.url, e.clone()),
+        None => request.url.to_string(), 
+    };
 
     if !url_string.starts_with("http://") && !url_string.starts_with("https://") {
         url_string = format!("http://{}", url_string);

src-tauri/src/render.rs

@@ -4,8 +4,8 @@ use crate::models::Environment;
 
 pub fn render(template: &str, environment: Environment) -> String {
     let variables = environment.data;
-    let re = Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}").expect("Failed to create regex");
-    let rendered = re
+    Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}")
+        .expect("Failed to create regex")
         .replace(template, |caps: &tauri::regex::Captures| {
             let key = caps.get(1).unwrap().as_str();
             match variables.get(key) {
@@ -19,7 +19,5 @@ pub fn render(template: &str, environment: Environment) -> String {
                 None => "".to_string(),
             }
         })
-        .to_string();
-
-    rendered
+        .to_string()
 }