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-models/src/queries/environments.rs

@@ -1,5 +1,7 @@
 use crate::db_context::DbContext;
-use crate::error::Error::{MissingBaseEnvironment, MultipleBaseEnvironments};
+use crate::error::Error::{
+    MissingBaseEnvironment, MultipleBaseEnvironments, MultipleFolderEnvironments,
+};
 use crate::error::Result;
 use crate::models::{Environment, EnvironmentIden, EnvironmentVariable};
 use crate::util::UpdateSource;
@@ -10,21 +12,31 @@ impl<'a> DbContext<'a> {
         self.find_one(EnvironmentIden::Id, id)
     }
 
+    pub fn get_environment_by_folder_id(&self, folder_id: &str) -> Result<Option<Environment>> {
+        let environments: Vec<Environment> =
+            self.find_many(EnvironmentIden::ParentId, folder_id, None)?;
+        if environments.len() > 1 {
+            return Err(MultipleFolderEnvironments(folder_id.to_string()));
+        }
+
+        Ok(environments.get(0).cloned())
+    }
+
     pub fn get_base_environment(&self, workspace_id: &str) -> Result<Environment> {
         let environments = self.list_environments_ensure_base(workspace_id)?;
-        let base_environments =
-            environments.into_iter().filter(|e| e.base).collect::<Vec<Environment>>();
+        let base_environments = environments
+            .into_iter()
+            .filter(|e| e.parent_id.is_none())
+            .collect::<Vec<Environment>>();
 
         if base_environments.len() > 1 {
             return Err(MultipleBaseEnvironments(workspace_id.to_string()));
         }
 
-        let base_environment = base_environments.into_iter().find(|e| e.base).ok_or(
+        Ok(base_environments.first().cloned().ok_or(
             // Should never happen because one should be created above if it does not exist
             MissingBaseEnvironment(workspace_id.to_string()),
-        )?;
-
-        Ok(base_environment)
+        )?)
     }
 
     /// Lists environments and will create a base environment if one doesn't exist
@@ -32,13 +44,12 @@ impl<'a> DbContext<'a> {
         let mut environments =
             self.find_many::<Environment>(EnvironmentIden::WorkspaceId, workspace_id, None)?;
 
-        let base_environment = environments.iter().find(|e| e.base);
+        let base_environment = environments.iter().find(|e| e.parent_id.is_none());
 
         if let None = base_environment {
             let e = self.upsert_environment(
                 &Environment {
                     workspace_id: workspace_id.to_string(),
-                    base: true,
                     name: "Global Variables".to_string(),
                     ..Default::default()
                 },
@@ -98,4 +109,43 @@ impl<'a> DbContext<'a> {
             source,
         )
     }
+
+    pub fn resolve_environments(
+        &self,
+        workspace_id: &str,
+        folder_id: Option<&str>,
+        active_environment_id: Option<&str>,
+    ) -> Result<Vec<Environment>> {
+        let mut environments = Vec::new();
+
+        if let Some(folder_id) = folder_id {
+            let folder = self.get_folder(folder_id)?;
+
+            // Add current folder's environment
+            if let Some(e) = self.get_environment_by_folder_id(folder_id)? {
+                environments.push(e);
+            };
+
+            // Recurse up
+            let ancestors = self.resolve_environments(
+                workspace_id,
+                folder.folder_id.as_deref(),
+                active_environment_id,
+            )?;
+            environments.extend(ancestors);
+        } else {
+            // Add active and base environments
+            if let Some(id) = active_environment_id {
+                if let Ok(e) = self.get_environment(&id) {
+                    // Add active sub environment
+                    environments.push(e);
+                };
+            };
+
+            // Add the base environment
+            environments.push(self.get_base_environment(workspace_id)?);
+        }
+
+        Ok(environments)
+    }
 }

src-tauri/yaak-models/src/queries/folders.rs

@@ -1,10 +1,7 @@
 use crate::connection_or_tx::ConnectionOrTx;
 use crate::db_context::DbContext;
 use crate::error::Result;
-use crate::models::{
-    Folder, FolderIden, GrpcRequest, GrpcRequestIden, HttpRequest, HttpRequestHeader,
-    HttpRequestIden, WebsocketRequest, WebsocketRequestIden,
-};
+use crate::models::{Environment, EnvironmentIden, Folder, FolderIden, GrpcRequest, GrpcRequestIden, HttpRequest, HttpRequestHeader, HttpRequestIden, WebsocketRequest, WebsocketRequestIden};
 use crate::util::UpdateSource;
 use serde_json::Value;
 use std::collections::BTreeMap;
@@ -37,6 +34,10 @@ impl<'a> DbContext<'a> {
             self.delete_websocket_request(&m, source)?;
         }
 
+        for e in self.find_many(EnvironmentIden::ParentId, fid, None)? {
+            self.delete_environment(&e, source)?;
+        }
+
         // Recurse down into child folders
         for folder in self.find_many::<Folder>(FolderIden::FolderId, fid, None)? {
             self.delete_folder(&folder, source)?;
@@ -99,6 +100,17 @@ impl<'a> DbContext<'a> {
             )?;
         }
 
+        for m in self.find_many::<Environment>(EnvironmentIden::ParentId, fid, None)? {
+            self.upsert_environment(
+                &Environment {
+                    id: "".into(),
+                    parent_id: Some(new_folder.id.clone()),
+                    ..m
+                },
+                source,
+            )?;
+        }
+
         for m in self.find_many::<Folder>(FolderIden::FolderId, fid, None)? {
             // Recurse down
             self.duplicate_folder(