Merge pull request #500 from hotosm/refactor

Added a new filter option (Filter by Project Status) in projects page

Author: nrjadkry

src/backend/app/drones/drone_routes.py

@@ -7,7 +7,10 @@
 from app.config import settings
 from app.drones import drone_schemas, drone_deps
 from psycopg import Connection
-
+from app.users.permissions import (
+    IsSuperUser,
+    check_permissions,
+)
 
 router = APIRouter(
     prefix=f"{settings.API_PREFIX}/drones",
@@ -31,7 +34,7 @@ async def read_drones(
 async def create_drone(
     drone_info: drone_schemas.DroneIn,
     db: Annotated[Connection, Depends(database.get_db)],
-    user_data: Annotated[AuthUser, Depends(login_required)],
+    user_data: Annotated[AuthUser, Depends(check_permissions(IsSuperUser()))],
 ):
     """Create a new drone in database"""
     drone_id = await drone_schemas.DbDrone.create(db, drone_info)
@@ -42,7 +45,7 @@ async def create_drone(
 async def delete_drone(
     drone: Annotated[drone_schemas.DbDrone, Depends(drone_deps.get_drone_by_id)],
     db: Annotated[Connection, Depends(database.get_db)],
-    user_data: Annotated[AuthUser, Depends(login_required)],
+    user_data: Annotated[AuthUser, Depends(check_permissions(IsSuperUser()))],
 ):
     """
     Deletes a drone record from the database.
@@ -56,8 +59,6 @@ async def delete_drone(
         dict: A success message if the drone was deleted.
     """
 
-    # TODO: Check user role, Admin can only do this.
-    # After user roles introduction
     drone_id = await drone_schemas.DbDrone.delete(db, drone.id)
     return {"message": f"Drone successfully deleted {drone_id}"}
 

src/frontend/src/components/Projects/ProjectsHeader/index.tsx

@@ -18,6 +18,9 @@ export default function ProjectsHeader() {
   const projectsFilterByOwner = useTypedSelector(
     state => state.createproject.ProjectsFilterByOwner,
   );
+  const selectedProjectStatus = useTypedSelector(
+    state => state.createproject.selectedProjectStatus
+  );
   const [searchValue, setSearchValue] = useState('');
   const debouncedValue = useDebounceListener(searchValue || '', 300);
 
@@ -30,7 +33,7 @@ export default function ProjectsHeader() {
       <FlexRow className="naxatw-flex naxatw-w-full naxatw-items-center naxatw-justify-between naxatw-gap-4 md:naxatw-w-[65%]">
         <h5 className="naxatw-font-bold">Projects</h5>
         <FlexRow gap={3} className="">
-          <div>
+          <div className='naxatw-flex naxatw-items-center naxatw-gap-2'>
             <Select
               placeholder="Select"
               options={[
@@ -50,6 +53,26 @@ export default function ProjectsHeader() {
                 )
               }
             />
+            <Select
+              placeholder="Filter By Project Status"
+              options={[
+                {
+                  label: 'Not Started',
+                  value: 'not-started',
+                },
+                { label: 'On Going', value: 'ongoing' },
+                { label: 'Completed', value: 'completed' },
+              ]}
+              labelKey="label"
+              valueKey="value"
+              className="!naxatw-w-[150px] "
+              selectedOption={selectedProjectStatus}
+              onChange={value =>
+                dispatch(
+                  setCreateProjectState({ selectedProjectStatus: value }),
+                )
+              }
+            />
           </div>
           <div>
             <SearchInput

src/frontend/src/store/slices/createproject.ts

@@ -25,6 +25,7 @@ export interface CreateProjectState {
   imageMergeType: string;
   ProjectsFilterByOwner: 'yes' | 'no';
   requiresApprovalFromRegulator: 'required' | 'not_required';
+  selectedProjectStatus: string;
   regulatorEmails: string[] | [];
   demType: string;
 }
@@ -53,6 +54,7 @@ const initialState: CreateProjectState = {
   requiresApprovalFromRegulator: 'not_required',
   regulatorEmails: [],
   demType: 'auto',
+  selectedProjectStatus: ''
 };
 
 const setCreateProjectState: CaseReducer<

src/frontend/src/views/Projects/index.tsx

@@ -23,6 +23,9 @@ const Projects = () => {
   const projectsFilterByOwner = useTypedSelector(
     state => state.createproject.ProjectsFilterByOwner,
   );
+  const projectFilterByStatus = useTypedSelector(
+    state => state.createproject.selectedProjectStatus,
+  );
   const projectSearchKey = useTypedSelector(
     state => state.common.projectSearchKey,
   );
@@ -35,16 +38,26 @@ const Projects = () => {
     setSetPaginationState(prev => ({ ...prev, ...value }));
   };
 
-  // fetch api for projectsList
-  const { data: projectListData, isFetching: isLoading }: Record<string, any> =
-    useGetProjectsListQuery({
-      queryKey: {
-        // @ts-ignore
+  const filterParams = projectFilterByStatus
+    ? {
         filter_by_owner: projectsFilterByOwner === 'yes',
+        status: projectFilterByStatus,
         page: paginationState?.activePage,
         results_per_page: paginationState?.selectedNumberOfRows,
         search: projectSearchKey,
-      },
+      }
+    : {
+        filter_by_owner: projectsFilterByOwner === 'yes',
+        page: paginationState?.activePage,
+        results_per_page: paginationState?.selectedNumberOfRows,
+        search: projectSearchKey,
+      };
+
+  // fetch api for projectsList
+  const { data: projectListData, isFetching: isLoading }: Record<string, any> =
+    useGetProjectsListQuery({
+      // @ts-ignore
+      queryKey: { ...filterParams },
     });
 
   // fetch project centroid
@@ -65,6 +78,7 @@ const Projects = () => {
   return (
     <section className="naxatw-px-3 naxatw-pt-2 lg:naxatw-px-16">
       <ProjectsHeader />
+
       <div className="naxatw-grid naxatw-gap-2 naxatw-pb-10 md:naxatw-flex md:naxatw-h-[calc(100vh-11rem)] md:naxatw-pb-0">
         <div
           className={`scrollbar naxatw-grid naxatw-grid-rows-[19rem] naxatw-gap-3 naxatw-overflow-y-auto naxatw-py-2 ${showMap ? 'naxatw-w-full naxatw-grid-cols-1 md:naxatw-w-1/2 md:naxatw-grid-cols-1 lg:naxatw-grid-cols-2 xl:naxatw-grid-cols-3' : 'naxatw-w-full naxatw-grid-cols-1 sm:naxatw-grid-cols-2 md:naxatw-grid-cols-3 lg:naxatw-grid-cols-6'}`}