Fix errors

Author: joepio

browser/data-browser/src/components/forms/ResourceSelector.tsx

@@ -14,12 +14,12 @@ import React, {
   useCallback,
 } from 'react';
 import { ErrMessage, InputWrapper } from './InputStyles';
-import { DropdownInput } from './DropdownInput';
 import { Dialog, useDialog } from '../Dialog';
 import { DialogTreeContext } from '../Dialog/dialogContext';
 import { useSettings } from '../../helpers/AppSettings';
 import styled from 'styled-components';
 import { NewFormDialog } from './NewForm/NewFormDialog';
+import { DropdownInput } from './ResourceSelector/DropdownInput';
 
 interface ResourceSelectorProps {
   /**

lib/src/collections.rs

@@ -494,7 +494,7 @@ mod test {
 
     #[test]
     fn create_collection_nested_members_and_sorting() {
-        let store = crate::Store::init().unwrap();
+        let mut store = crate::Store::init().unwrap();
         store.populate().unwrap();
         let collection_builder = CollectionBuilder {
             subject: "test_subject".into(),
@@ -560,7 +560,7 @@ mod test {
     #[ignore]
     // TODO: This currently only tests atomicdata.dev, should test local resources. These need to be rewritten
     fn get_collection_params() {
-        let store = crate::Store::init().unwrap();
+        let mut store = crate::Store::init().unwrap();
         store.populate().unwrap();
 
         let collection_page_size = store

lib/src/commit.rs

@@ -807,7 +807,7 @@ mod test {
     #[test]
     fn signature_matches() {
         let private_key = "CapMWIhFUT+w7ANv9oCPqrHrwZpkP2JhzF9JnyT6WcI=";
-        let store = crate::Store::init().unwrap();
+        let mut store = crate::Store::init().unwrap();
         store.populate().unwrap();
         let agent = Agent::new_from_private_key(None, &store, private_key).unwrap();
         assert_eq!(

lib/src/db.rs

@@ -11,7 +11,7 @@ mod val_prop_sub_index;
 
 use std::{
     collections::{HashMap, HashSet},
-    sync::{Arc, Mutex},
+    sync::Arc,
     vec,
 };
 
@@ -91,7 +91,7 @@ pub struct Db {
     /// Function called whenever a Commit is applied.
     handle_commit: Option<Arc<HandleCommit>>,
     /// Email SMTP client for sending email.
-    smtp_client: Option<Arc<Mutex<Transport<'static, Connected>>>>,
+    smtp_client: Option<Arc<tokio::sync::Mutex<Transport<'static, Connected>>>>,
 }
 
 impl Db {
@@ -364,7 +364,7 @@ impl Db {
         &mut self,
         smtp_config: crate::email::SmtpConfig,
     ) -> AtomicResult<()> {
-        self.smtp_client = Some(Arc::new(Mutex::new(
+        self.smtp_client = Some(Arc::new(tokio::sync::Mutex::new(
             crate::email::get_smtp_client(smtp_config).await?,
         )));
         Ok(())
@@ -379,7 +379,8 @@ impl Db {
                     "No SMTP client configured. Please call set_smtp_config first.".into(),
                 )
             })?
-            .lock()?;
+            .lock()
+            .await;
         email::send_mail(&mut client, message).await?;
         Ok(())
     }

lib/src/serialize.rs

@@ -265,7 +265,7 @@ mod test {
 
     #[test]
     fn serialize_json_ad() {
-        let store = crate::Store::init().unwrap();
+        let mut store = crate::Store::init().unwrap();
         store.populate().unwrap();
         let json = store
             .get_resource(crate::urls::AGENT)

lib/src/store.rs

@@ -265,7 +265,7 @@ mod test {
     use crate::{agents::ForAgent, urls, Value};
 
     fn init_store() -> Store {
-        let store = Store::init().unwrap();
+        let mut store = Store::init().unwrap();
         store.populate().unwrap();
         store
     }