Merge pull request #256

* Update environment model to get ready for request/folder environments

* Folder environments in UI

* Folder environments working

* Tweaks and fixes

* Tweak environment encryption UX

* Tweak environment encryption UX

* Address comments

* Update fn name

* Add tsc back to lint rules

* Update src-web/components/EnvironmentEditor.tsx

* Merge remote-tracking branch 'origin/folder-environments' into folder…

src-tauri/yaak-plugins/bindings/gen_models.ts

@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, base: boolean, variables: Array<EnvironmentVariable>, color: string | null, };
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, variables: Array<EnvironmentVariable>, color: string | null, parentModel: string, parentId: string | null, };
 
 export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };
 

src-tauri/yaak-plugins/src/manager.rs

@@ -584,8 +584,7 @@ impl PluginManager {
     pub async fn get_http_authentication_config<R: Runtime>(
         &self,
         window: &WebviewWindow<R>,
-        base_environment: &Environment,
-        environment: Option<&Environment>,
+        environment_chain: Vec<Environment>,
         auth_name: &str,
         values: HashMap<String, JsonPrimitive>,
         request_id: &str,
@@ -596,7 +595,7 @@ impl PluginManager {
             .find_map(|(p, r)| if r.name == auth_name { Some(p) } else { None })
             .ok_or(PluginNotFoundErr(auth_name.into()))?;
 
-        let vars = &make_vars_hashmap(&base_environment, environment);
+        let vars = &make_vars_hashmap(environment_chain);
         let cb = PluginTemplateCallback::new(
             window.app_handle(),
             &PluginWindowContext::new(&window),
@@ -629,14 +628,13 @@ impl PluginManager {
     pub async fn call_http_authentication_action<R: Runtime>(
         &self,
         window: &WebviewWindow<R>,
-        base_environment: &Environment,
-        environment: Option<&Environment>,
+        environment_chain: Vec<Environment>,
         auth_name: &str,
         action_index: i32,
         values: HashMap<String, JsonPrimitive>,
         model_id: &str,
     ) -> Result<()> {
-        let vars = &make_vars_hashmap(&base_environment, environment);
+        let vars = &make_vars_hashmap(environment_chain);
         let rendered_values = render_json_value_raw(
             json!(values),
             vars,

src-tauri/yaak-plugins/src/nodejs.rs

@@ -1,20 +1,12 @@
 use crate::error::Result;
 use log::{info, warn};
-use serde;
-use serde::Deserialize;
 use std::net::SocketAddr;
 use tauri::path::BaseDirectory;
 use tauri::{AppHandle, Manager, Runtime};
-use tauri_plugin_shell::ShellExt;
 use tauri_plugin_shell::process::CommandEvent;
+use tauri_plugin_shell::ShellExt;
 use tokio::sync::watch::Receiver;
 
-#[derive(Deserialize, Default)]
-#[serde(default, rename_all = "camelCase")]
-struct PortFile {
-    port: i32,
-}
-
 pub async fn start_nodejs_plugin_runtime<R: Runtime>(
     app: &AppHandle<R>,
     addr: SocketAddr,