Merge branch 'main' into reset-password

uwblueprint · Aug 26, 2024 · d3cb809 · d3cb809
2 parents 9d0503c + d77e915
commit d3cb809
Show file tree

Hide file tree

Showing 24 changed files with 592 additions and 221 deletions.
diff --git a/backend/app/graphql/meal_request.py b/backend/app/graphql/meal_request.py
@@ -140,7 +140,6 @@ def mutate(
 
             print("requestor id is", requestor_id)
 
-            # TODO: Re-enable this check
             if (
                 requestor_role != "Admin"
                 and meal_request.donation_info["donor"]["id"] != requestor_id

diff --git a/backend/app/resources/meal_request_dto.py b/backend/app/resources/meal_request_dto.py
@@ -49,17 +49,18 @@ def validate(self):
 
         validate_user(self.requestor, "requestor", error_list)
 
-        # if type(self.status) is not str:
-        #     error_list.append("The status supplied is not a string.")
+        if type(self.status) is not str:
+            error_list.append(
+                f"The status supplied was type {type(self.status)}, but expected a string."
+            )
 
         if self.status not in MEAL_STATUSES_STRINGS:
-            # TODO: revisit this
-            pass
-            # error_list.append(
-            #     "The status {self_status} is not one of {valid_statuses}".format(
-            #         self_status=self.status, valid_statuses=", ".join(MEAL_STATUSES)
-            #     )
-            # )
+            error_list.append(
+                "The status {self_status} is not one of {valid_statuses}".format(
+                    self_status=self.status,
+                    valid_statuses=", ".join(MEAL_STATUSES_STRINGS),
+                )
+            )
 
         if type(self.drop_off_datetime) is not datetime.datetime:
             error_list.append(

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -28,9 +28,9 @@
     "jose": "^4.11.1",
     "json-schema": "^0.3.0",
     "json2csv": "^5.0.6",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-bootstrap": "^1.5.2",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.3.1",
     "react-icons": "^5.0.1",
     "react-json-schema": "^1.2.2",
     "react-jsonschema-form": "^1.8.1",
@@ -109,4 +109,4 @@
     "autoprefixer": "10.4.5",
     "postcss-preset-env": "7.4.4"
   }
-}
+}
diff --git a/frontend/src/Routes.tsx b/frontend/src/Routes.tsx
@@ -13,6 +13,7 @@ import MealDonationForm from "./components/meal_donor/donation_form/MealDonation
 import * as Paths from "./constants/Routes";
 import Dashboard from "./pages/ASPDashboard";
 import MealDonorCalendar from "./pages/MealDonorCalendar";
+import MealDonorConfirmation from "./pages/MealDonorConfirmation";
 import MealDonorDashboard from "./pages/MealDonorDashboard";
 import NotFound from "./pages/NotFound";
 import OnboardingRequestsPage from "./pages/OnboardingRequestsPage";
@@ -57,6 +58,10 @@ const Routes = (): React.ReactElement => {
           path={Paths.MEAL_DONOR_UPCOMING_PAGE}
           element={<UpcomingPage />}
         />
+        <Route
+          path={Paths.MEAL_DONOR_CONFIRMATION_PAGE}
+          element={<MealDonorConfirmation />}
+        />
         <Route
           path={Paths.ONBOARDING_REQUESTS_PAGE}
           element={<OnboardingRequestsPage />}

diff --git a/frontend/src/assets/confirmation.png b/frontend/src/assets/confirmation.png
diff --git a/frontend/src/components/asp/requests/CreateMealRequest.tsx b/frontend/src/components/asp/requests/CreateMealRequest.tsx
@@ -65,7 +65,6 @@ const CreateMealRequest = (): React.ReactElement => {
     Array(7).fill(false),
   );
 
-  // TODO: once the last tab is reached, submit the form
   // Below is a way to get a list of days, i.e. the indexes of the true values in the boolean array
   const selectedDays = weekdayButtonStates
     .map((state, i) => (state ? i : -1))

diff --git a/frontend/src/components/asp/requests/SchedulingFormMealInfo.tsx b/frontend/src/components/asp/requests/SchedulingFormMealInfo.tsx
@@ -186,7 +186,7 @@ const SchedulingFormMealInfo: React.FunctionComponent<SchedulingFormMealInfoProp
             <OnsiteContactSection
               onsiteInfo={onsiteContact}
               setOnsiteInfo={setOnsiteContact}
-              attemptedSubmit={false /* todo change */}
+              attemptedSubmit={attemptedSubmit}
               availableStaff={availableStaff}
               dropdown
             />

diff --git a/frontend/src/components/asp/requests/SchedulingFormReviewAndSubmit.tsx b/frontend/src/components/asp/requests/SchedulingFormReviewAndSubmit.tsx
@@ -1,4 +1,4 @@
-import { gql, useMutation } from "@apollo/client";
+import { gql, useApolloClient, useMutation } from "@apollo/client";
 import {
   Box,
   Button,
@@ -103,6 +103,8 @@ const SchedulingFormReviewAndSubmit: React.FunctionComponent<SchedulingFormRevie
 
   const navigate = useNavigate();
   const [isSubmitLoading, setIsSubmitLoading] = useState(false);
+  const apolloClient = useApolloClient();
+
 
   // Datetimes is a list of javascript dates with the correct date and time.
   // The "mealRequestDates" only is dates without the time, so we need to add the time to it.
@@ -142,6 +144,8 @@ const SchedulingFormReviewAndSubmit: React.FunctionComponent<SchedulingFormRevie
 
       // On success, navigate to dashboard
       if (response.data) {
+        apolloClient.cache.evict({ fieldName: "getMealRequestsByRequestorId" });
+        apolloClient.cache.evict({ fieldName: "getMealRequestsByDonorId" });
         toast({
           title: "Meal request submitted!",
           status: "success",