Added go back to all meal requests button

Author: shahanneda

backend/app/services/implementations/user_service.py

@@ -139,14 +139,18 @@ def get_auth_id_by_user_id(self, user_id):
             )
             raise e
 
-    def get_users(self, offset, limit, role, name: Union[str, None], email : Union[str, None]):
+    def get_users(
+        self, offset, limit, role, name: Union[str, None], email: Union[str, None]
+    ):
         user_dtos = []
         filteredUsers = User.objects()
         if role:
             filteredUsers = filteredUsers.filter(info__role=role)
 
         if name:
-            filteredUsers = filteredUsers.filter(info__organization_name__icontains=name)
+            filteredUsers = filteredUsers.filter(
+                info__organization_name__icontains=name
+            )
 
         if email:
             filteredUsers = filteredUsers.filter(info__email__icontains=email)

backend/app/services/interfaces/user_service.py

@@ -75,7 +75,14 @@ def get_auth_id_by_user_id(self, user_id):
         pass
 
     @abstractmethod
-    def get_users(self, offset: int, limit: int, role: UserInfoRole, name: Union[str, None], email : Union[str, None]):
+    def get_users(
+        self,
+        offset: int,
+        limit: int,
+        role: UserInfoRole,
+        name: Union[str, None],
+        email: Union[str, None],
+    ):
         """
         Get all users (possibly paginated in the future)
 

backend/tests/graphql/test_all_user_queries.py

@@ -230,6 +230,7 @@ def test_all_users_fiter_by_email(user_setup):
     assert user_result["id"] == str(user_3.id)
     assert user_result["info"] == MOCK_INFO3_CAMEL
 
+
 # Note: mongomock does not currently support $geoNear queries, so cannot test
 # https://github.com/mongomock/mongomock/blob/develop/Missing_Features.rst
 # def test_get_asp_near_location(user_setup):

frontend/src/components/mealrequest/AdminListView.tsx

@@ -26,9 +26,12 @@ import {
 } from "@chakra-ui/react";
 import * as TABLE_LIBRARY_TYPES from "@table-library/react-table-library/types/table";
 import React, { useContext, useEffect, useState } from "react";
-import { BsFilter } from "react-icons/bs";
+import { BsFilter, BsReplyAll } from "react-icons/bs";
 import { FiFilter } from "react-icons/fi";
 
+import { useNavigate } from "react-router-dom";
+
+import { ADMIN_MEAL_REQUESTS_PAGE } from "../../constants/Routes";
 import AuthContext from "../../contexts/AuthContext";
 import {
   MealRequest,
@@ -478,6 +481,7 @@ const AdminListView = ({
   const [mealRequestId, setMealRequestId] = useState<string>("");
   const [isUpcoming, setIsUpcoming] = useState<boolean>(false);
   const [shouldReload, setShouldReload] = useState(false);
+  const navigate = useNavigate();
 
   const handleExpand = (item: TABLE_LIBRARY_TYPES.TableNode) => () => {
     if (item.pending) return;
@@ -631,7 +635,6 @@ const AdminListView = ({
 
   useEffect(() => {
     if (shouldReload) {
-      // console.log("Doing a reload! ", shouldReload);
       reloadMealRequests();
       setShouldReload(false);
     }
@@ -641,7 +644,7 @@ const AdminListView = ({
   useEffect(() => {
     reloadMealRequests();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [filter, sort, currentPage, authenticatedUser]);
+  }, [filter, sort, currentPage, authenticatedUser, aspId, donorId]);
 
   const COLUMNS = [
     {
@@ -887,6 +890,31 @@ const AdminListView = ({
   return (
     <Box mt="24px" width="80%">
       <Flex gap="10px" marginBottom="20px" justifyContent="flex-end">
+        {aspId || donorId ? 
+        <Menu>
+          <MenuButton
+            as={ChakraButton}
+            _hover={{ backgroundColor: "gray.200" }}
+            padding="6px 10px"
+            borderRadius="3px"
+            fontSize="14px"
+            border="solid 1px #E2E8F0"
+            boxShadow="lg"
+            backgroundColor="white"
+            color="black"
+            minWidth="75px"
+            onClick={() => {
+              navigate(ADMIN_MEAL_REQUESTS_PAGE, { replace: false } );
+            }}
+          >
+            <Flex gap="2px">
+              <BsReplyAll />
+              <Text>
+                View All Meal Requests
+              </Text>
+            </Flex>
+          </MenuButton>
+        </Menu> : null}
         <Menu>
           <MenuButton
             as={ChakraButton}

frontend/src/pages/AdminMealRequestsPage.tsx

@@ -24,8 +24,8 @@ const GET_USER = gql`
 const AdminMealRequestsPage = (): React.ReactElement => {
     const { donorId, aspId } = useParams<{donorId: string, aspId: string}>();
 
-    const [title, setTitle] = useState<string>("All Meal Requests");
-    const [description, setDescription] = useState<string>("Here is a table of all the meal requests");
+    const [title, setTitle] = useState<string>("");
+    const [description, setDescription] = useState<string>("");
 
     const { data: donorData } = useQuery<GetUserData, GetUserVariables>(GET_USER, {
         variables: { id: donorId || "" },
@@ -46,6 +46,9 @@ const AdminMealRequestsPage = (): React.ReactElement => {
             const name = aspData.getUserById?.info?.organizationName;
             setTitle(`Meal Requests for ${name}`);
             setDescription(`Here is a table of all the meal requests for ${name}`);
+        } else {
+            setTitle("All Meal Requests");
+            setDescription("Here is a table of all the meal requests");
         }
     }, [donorId, aspId, donorData, aspData]);