Merge pull request #76 from R15-Software-Dev/chore/api-err-return

Make student eligibility return an error

src/app.rs

@@ -1,11 +1,11 @@
 use crate::components::ToastList;
 use crate::components::login::ProviderLoginContext;
-use crate::pages::student;
 use crate::pages::{
     AdminHomePage, AdminProviderPage, AdminScholarshipPage, AdminShell, AdminUtilsPage,
     ApplicantsPageFallback, AuthCallbackPage, LoanerBorrowForm, LoanerFallback, LoanerReturnForm,
-    LoanerShell, ProviderContactPage, ProviderPortal, ScholarshipInfoPage,
+    LoanerShell, ProviderContactPage, ProviderPortal,
 };
+use crate::pages::{FormClosedPage, student};
 use leptos::prelude::*;
 use leptos_meta::{MetaTags, Stylesheet, Title, provide_meta_context};
 use leptos_oidc::AuthSignal;
@@ -89,11 +89,11 @@ fn ProviderRoutes() -> impl MatchNestedRoutes + Clone {
             <Route path=path!("/applicants") view=ApplicantsPageFallback />
             <Route path=path!("/callback") view=AuthCallbackPage />
             <Route path=path!("/profile") view=ProviderContactPage />
-            // <Route path=path!("/scholarships") view=FormClosedPage />
+            <Route path=path!("/scholarships") view=FormClosedPage />
-            <ParentRoute path=path!("/scholarships") view=ScholarshipInfoPage>
+        // <ParentRoute path=path!("/scholarships") view=ScholarshipInfoPage>
-                <Route path=path!(":id") view=ScholarshipInfoPage />
+        // <Route path=path!(":id") view=ScholarshipInfoPage />
-                <Route path=path!("") view=ScholarshipInfoPage />
+        // <Route path=path!("") view=ScholarshipInfoPage />
-            </ParentRoute>
+        // </ParentRoute>
         </ParentRoute>
     }
     .into_inner()

src/components/file_drop.rs

@@ -1,6 +1,6 @@
 use crate::pages::api::files::{DeleteFile, upload_file};
 use leptos::html::{Input, Label};
-use leptos::logging::debug_log;
+use leptos::logging::{debug_error, debug_log};
 use leptos::prelude::*;
 use leptos::web_sys::{File, FormData};
 use leptos_icons::Icon;
@@ -28,6 +28,7 @@ pub fn FileDrop(
 
     let file_name_list = RwSignal::new(Vec::new());
     let hovering = RwSignal::new(false);
+    let error_msg = RwSignal::new(String::new());
     let name = StoredValue::new(name);
     let form_id = StoredValue::new(form_id);
     let auth = expect_context::<AuthSignal>();
@@ -172,10 +173,18 @@ pub fn FileDrop(
             existing_files
                 .get()
                 .map(|result| {
-                    if let Ok(files) = result {
+                    match result {
-                        file_name_list.set(files);
+                        Ok(files) => {
+                            error_msg.set("".to_string());
+                            file_name_list.set(files);
+                        }
+                        Err(err) => {
+                            let msg = err.to_string();
+                            debug_error!("Error while getting files: {}", msg);
+                            error_msg.set(msg);
+                        }
                     }
-                })
+                });
         }}
         <label
             node_ref=zone_ref
@@ -194,6 +203,9 @@ pub fn FileDrop(
             <div class="text-sm text-gray-400">"Or click to select a file"</div>
             <input node_ref=input_ref type="file" class="hidden" on:change=on_input_change />
         </label>
+        <Show when=move || !error_msg.get().is_empty()>
+            <div class="flex-1">{error_msg}</div>
+        </Show>
         <For
             each=move || file_name_list.get()
             key=|file| file.clone()

src/pages/student/eligibility_page.rs

@@ -4,7 +4,7 @@ use crate::pages::api::files::list_files;
 use crate::pages::api::students::get_all_student_data;
 use crate::pages::api::{get_all_scholarship_info, get_comparison_info};
 use crate::utils::get_user_claims;
-use leptos::logging::{debug_log, debug_error};
+use leptos::logging::{debug_error, debug_log};
 use leptos::prelude::*;
 use leptos_oidc::AuthSignal;
 
@@ -23,6 +23,11 @@ pub fn StudentEligibilityPage() -> impl IntoView {
     let auth = expect_context::<AuthSignal>();
     let user_claims = get_user_claims();
     let user_id = Memo::new(move |_| user_claims.get().map(|info| info.claims.subject.clone()));
+    let access_token = Memo::new(move |_| auth.get().authenticated().map(|a| a.access_token()));
+
+    Effect::new(move || {
+        debug_log!("User ID was updated: {}", user_id.get().unwrap_or_default());
+    });
 
     let form_id = StoredValue::new("scholarship_essays".to_string());
 
@@ -111,19 +116,23 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                                             true
                                         } else {
                                             list.iter()
-                                                .any(
+                                                .any(|requirement| {
-                                                    |requirement| {
+                                                    let result = requirement.compare(&student_info);
-                                                        let result = requirement
+                                                    match result.as_ref() {
-                                                            .compare(&student_info);
+                                                        Ok(status) => {
-
+                                                            debug_log!(
-                                                        match result.as_ref() {
+                                                                "Requirement with id {} is Ok({})", requirement.id, status
-                                                            Ok(_) => debug_log!("Requirement with id {} success", requirement.id),
+                                                            );
-                                                            Err(e) => debug_error!("Requirement with id {} failed: {}", requirement.id, e)
+                                                            status.clone()
-                                                        };
+                                                        }
-
+                                                        Err(e) => {
-                                                        result.is_ok()
+                                                            debug_error!(
-                                                    },
+                                                                "Requirement with id {} failed: {}", requirement.id, e
-                                                )
+                                                            );
+                                                            false
+                                                        }
+                                                    }
+                                                })
                                         }
                                     });
                             if valid {
@@ -131,19 +140,15 @@ pub fn StudentEligibilityPage() -> impl IntoView {
                                 let scholarship_id = StoredValue::new(scholarship.subject.clone());
                                 let resource = Resource::new(
                                     move || (
-                                        auth
+                                        access_token.get(),
-                                            .try_with(|a| a.authenticated().map(|a| a.access_token()))
-                                            .flatten(),
                                         form_id.get_value(),
                                         scholarship_id.get_value(),
                                     ),
                                     async move |(access_token, form_id, scholarship_id)| {
-                                        list_files(
+                                        let Some(access_token) = access_token else {
-                                                access_token.unwrap_or_default(),
+                                            return Err(ServerFnError::new("Couldn't find access token"));
-                                                form_id,
+                                        };
-                                                scholarship_id,
+                                        list_files(access_token, form_id, scholarship_id).await
-                                            )
-                                            .await
                                     },
                                 );
                                 Some((scholarship.clone(), resource))

src/pages/student/form_setup.rs

@@ -1,10 +1,10 @@
-use std::collections::HashMap;
-use leptos::prelude::*;
-use uuid::Uuid;
 use crate::common::ValueType;
 use crate::components::{Toast, ToastContext};
-use crate::pages::api::students::{get_student_data, PutStudentData};
+use crate::pages::api::students::{PutStudentData, get_student_data};
 use crate::utils::get_user_claims;
+use leptos::prelude::*;
+use std::collections::HashMap;
+use uuid::Uuid;
 
 pub struct StudentFormInfo {
     pub data_map: RwSignal<HashMap<String, ValueType>>,
@@ -20,22 +20,21 @@ pub fn use_student_form(
     enable_toasts: bool,
 ) -> StudentFormInfo {
     let form_type = form_type.into();
-    
+
     let user_claims = get_user_claims();
-    let user_id = Memo::new(move |_| {
+    let user_id = Memo::new(move |_| user_claims.get().map(|info| info.claims.subject.clone()));
-        user_claims.get()
-            .map(|info| info.claims.subject.clone())
-    });
 
     let data_map = RwSignal::new(HashMap::new());
 
     let refresh_trigger = Trigger::new();
     let data_resource = Resource::new(
-        move || (user_id.get().unwrap_or_default(), form_type.get(), refresh_trigger.track()),
+        move || (user_id.get(), form_type.get(), refresh_trigger.track()),
-        async move |(id, form_type, _)| get_student_data(
+        async move |(id, form_type, _)| {
-            id,
+            let Some(id) = id else {
-            form_type,
+                return Ok(HashMap::new());
-        ).await
+            };
+            get_student_data(id, form_type).await
+        },
     );
 
     Effect::new(move || {
@@ -50,13 +49,15 @@ pub fn use_student_form(
 
     let submit_action = ServerAction::<PutStudentData>::new();
     let on_submit = move || {
-        submit_action.dispatch(PutStudentData {
+        if let Some(id) = user_id.get() {
-            subject: user_id.get().unwrap_or_default(),
+            submit_action.dispatch(PutStudentData {
-            data_type: form_type.get(),
+                subject: id,
-            data_map: data_map.get()
+                data_type: form_type.get(),
-        });
+                data_map: data_map.get(),
+            });
+        }
     };
-    
+
     if enable_toasts {
         let mut toasts = expect_context::<ToastContext>();
         Effect::watch(
@@ -74,13 +75,13 @@ pub fn use_student_form(
                     Err(e) => Toast::new()
                         .id(Uuid::new_v4())
                         .header("Submission Failed")
-                        .msg(e.to_string())
+                        .msg(e.to_string()),
                 };
 
                 toasts.toast(toast);
                 untrack(move || submit_action.clear());
             },
-            false
+            false,
         );
     }
 
@@ -90,6 +91,6 @@ pub fn use_student_form(
         data_resource,
         user_id,
         submit_action: on_submit.into(),
-        submit_pending: submit_action.pending()
+        submit_pending: submit_action.pending(),
     }
-}
+}