From c9f772e3adb9f446652ba0c7e31d08bcd74ad776 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 14 Oct 2024 11:50:42 +0545
Subject: [PATCH 01/11] fix(task-description): set height to update takeoff
 point button section

---
 .../src/components/DroneOperatorTask/MapSection/index.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/components/DroneOperatorTask/MapSection/index.tsx b/src/frontend/src/components/DroneOperatorTask/MapSection/index.tsx
index b4d56903..e8ccced3 100644
--- a/src/frontend/src/components/DroneOperatorTask/MapSection/index.tsx
+++ b/src/frontend/src/components/DroneOperatorTask/MapSection/index.tsx
@@ -254,7 +254,7 @@ const MapSection = ({ className }: { className?: string }) => {
             </>
           )}
 
-          <div className="naxatw-absolute naxatw-bottom-3 naxatw-right-[calc(50%-5.4rem)] naxatw-z-30 lg:naxatw-right-3 lg:naxatw-top-3">
+          <div className="naxatw-absolute naxatw-bottom-3 naxatw-right-[calc(50%-5.4rem)] naxatw-z-30 naxatw-h-fit lg:naxatw-right-3 lg:naxatw-top-3">
             <Button
               withLoader
               leftIcon="place"

From aadc06b38634c45b20fde6962e06ae6ecc7851d0 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Mon, 14 Oct 2024 11:54:26 +0545
Subject: [PATCH 02/11] feat: added new assets download endpoint

---
 src/backend/app/projects/project_deps.py    | 26 +++++++++++++--
 src/backend/app/projects/project_routes.py  | 27 +++++++++++++---
 src/backend/app/projects/project_schemas.py | 35 ++++++++++-----------
 3 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/src/backend/app/projects/project_deps.py b/src/backend/app/projects/project_deps.py
index 521a9bdc..3d62ee60 100644
--- a/src/backend/app/projects/project_deps.py
+++ b/src/backend/app/projects/project_deps.py
@@ -7,13 +7,35 @@
 from fastapi import Depends, HTTPException, Path, File, UploadFile
 from psycopg import Connection
 from geojson import FeatureCollection
-
+from psycopg.rows import dict_row
 from app.db import database
 from app.models.enums import HTTPStatus
 from app.projects.project_schemas import DbProject
 from app.utils import multipolygon_to_polygon
 
 
+async def get_tasks_by_project_id(project_id: UUID, db: Connection):
+    """Get tasks by project id."""
+    try:
+        async with db.cursor(row_factory=dict_row) as cur:
+            await cur.execute(
+                """SELECT id FROM tasks WHERE project_id = %(project_id)s""",
+                {"project_id": project_id},
+            )
+
+            data = await cur.fetchall()
+
+            if data is None:
+                raise HTTPException(
+                    status_code=HTTPStatus.FORBIDDEN,
+                    detail="No tasks found for this project.",
+                )
+            return data
+
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
 async def get_project_by_id(
     project_id: Annotated[
         UUID,
@@ -27,7 +49,7 @@ async def get_project_by_id(
     try:
         return await DbProject.one(db, project_id)
     except KeyError as e:
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND) from e
+        raise HTTPException(status_code=HTTPStatus.FORBIDDEN) from e
 
 
 async def geojson_upload(
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index 3e7f2060..cb07863b 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -388,17 +388,34 @@ async def process_imagery(
 
 
 @router.get(
-    "/assets/{project_id}/{task_id}/",
+    "/assets/{project_id}/",
     tags=["Image Processing"],
-    response_model=project_schemas.AssetsInfo,
 )
 async def get_assets_info(
+    db: Annotated[Connection, Depends(database.get_db)],
     project: Annotated[
         project_schemas.DbProject, Depends(project_deps.get_project_by_id)
     ],
-    task_id: uuid.UUID,
+    task_id: Optional[uuid.UUID] = None,
 ):
     """
-    Endpoint to get the number of images and the URL to download the assets for a given project and task.
+    Endpoint to get the number of images and the URL to download the assets
+    for a given project and task. If no task_id is provided, returns info
+    for all tasks associated with the project.
     """
-    return project_logic.get_project_info_from_s3(project.id, task_id)
+    if task_id is None:
+        print("*" * 100)
+        # Fetch all tasks associated with the project
+        tasks = await project_deps.get_tasks_by_project_id(project.id, db)
+
+        results = []
+
+        for task in tasks:
+            task_info = await project_logic.get_project_info_from_s3(
+                project.id, task.get("id")
+            )
+            results.append(task_info)
+
+        return results
+    else:
+        return project_logic.get_project_info_from_s3(project.id, task_id)
diff --git a/src/backend/app/projects/project_schemas.py b/src/backend/app/projects/project_schemas.py
index 083d2b20..3cb5dd01 100644
--- a/src/backend/app/projects/project_schemas.py
+++ b/src/backend/app/projects/project_schemas.py
@@ -2,7 +2,6 @@
 import uuid
 from typing import Annotated, Optional, List
 from datetime import datetime, date
-from app.projects import project_logic
 import geojson
 from loguru import logger as log
 from pydantic import BaseModel, computed_field, Field, model_validator, root_validator
@@ -147,23 +146,23 @@ class TaskOut(BaseModel):
     image_count: Optional[int] = None
     assets_url: Optional[str] = None
 
-    @model_validator(mode="after")
-    def set_assets_url(cls, values):
-        """Set image_url and image count before rendering the model."""
-        task_id = values.id
-        project_id = values.project_id
-
-        if task_id and project_id:
-            data = project_logic.get_project_info_from_s3(project_id, task_id)
-            if data:
-                return values.copy(
-                    update={
-                        "assets_url": data.assets_url,
-                        "image_count": data.image_count,
-                    }
-                )
-
-        return values
+    # @model_validator(mode="after")
+    # def set_assets_url(cls, values):
+    #     """Set image_url and image count before rendering the model."""
+    #     task_id = values.id
+    #     project_id = values.project_id
+
+    #     if task_id and project_id:
+    #         data = project_logic.get_project_info_from_s3(project_id, task_id)
+    #         if data:
+    #             return values.copy(
+    #                 update={
+    #                     "assets_url": data.assets_url,
+    #                     "image_count": data.image_count,
+    #                 }
+    #             )
+
+    #     return values
 
 
 class DbProject(BaseModel):

From 839f164f3243bf4ebec6c318cadb4e9acfe577f3 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Mon, 14 Oct 2024 11:58:38 +0545
Subject: [PATCH 03/11] fix: remove await from assets download endpoint

---
 src/backend/app/projects/project_routes.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index cb07863b..18f64939 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -404,14 +404,13 @@ async def get_assets_info(
     for all tasks associated with the project.
     """
     if task_id is None:
-        print("*" * 100)
         # Fetch all tasks associated with the project
         tasks = await project_deps.get_tasks_by_project_id(project.id, db)
 
         results = []
 
         for task in tasks:
-            task_info = await project_logic.get_project_info_from_s3(
+            task_info = project_logic.get_project_info_from_s3(
                 project.id, task.get("id")
             )
             results.append(task_info)

From c7df31d53e34cccf3bd54a22c0af087933a7b268 Mon Sep 17 00:00:00 2001
From: Pradip-p <thapapradip542@gmail.com>
Date: Mon, 14 Oct 2024 12:22:31 +0545
Subject: [PATCH 04/11] feat: added users authentication

---
 src/backend/app/projects/project_routes.py  |  1 +
 src/backend/app/projects/project_schemas.py | 18 ------------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index 18f64939..14ecc367 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -392,6 +392,7 @@ async def process_imagery(
     tags=["Image Processing"],
 )
 async def get_assets_info(
+    user_data: Annotated[AuthUser, Depends(login_required)],
     db: Annotated[Connection, Depends(database.get_db)],
     project: Annotated[
         project_schemas.DbProject, Depends(project_deps.get_project_by_id)
diff --git a/src/backend/app/projects/project_schemas.py b/src/backend/app/projects/project_schemas.py
index 3cb5dd01..42986800 100644
--- a/src/backend/app/projects/project_schemas.py
+++ b/src/backend/app/projects/project_schemas.py
@@ -146,24 +146,6 @@ class TaskOut(BaseModel):
     image_count: Optional[int] = None
     assets_url: Optional[str] = None
 
-    # @model_validator(mode="after")
-    # def set_assets_url(cls, values):
-    #     """Set image_url and image count before rendering the model."""
-    #     task_id = values.id
-    #     project_id = values.project_id
-
-    #     if task_id and project_id:
-    #         data = project_logic.get_project_info_from_s3(project_id, task_id)
-    #         if data:
-    #             return values.copy(
-    #                 update={
-    #                     "assets_url": data.assets_url,
-    #                     "image_count": data.image_count,
-    #                 }
-    #             )
-
-    #     return values
-
 
 class DbProject(BaseModel):
     """Project model for extracting from database."""

From 9d11b5382c4e5b7c5a2fbf82dddd2220c2943de0 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 14 Oct 2024 14:07:53 +0545
Subject: [PATCH 05/11] feat(project-dashboard): udpdate row per page options

---
 src/frontend/src/constants/index.ts       | 7 +++----
 src/frontend/src/views/Projects/index.tsx | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/frontend/src/constants/index.ts b/src/frontend/src/constants/index.ts
index dca9fd77..561da55c 100644
--- a/src/frontend/src/constants/index.ts
+++ b/src/frontend/src/constants/index.ts
@@ -81,9 +81,8 @@ export const droneOperatorKeys = [
 ];
 
 export const rowsPerPageOptions = [
-  { label: '10', value: 10 },
-  { label: '20', value: 20 },
+  { label: '12', value: 12 },
+  { label: '18', value: 18 },
+  { label: '24', value: 24 },
   { label: '30', value: 30 },
-  { label: '50', value: 50 },
-  { label: '100', value: 100 },
 ];
diff --git a/src/frontend/src/views/Projects/index.tsx b/src/frontend/src/views/Projects/index.tsx
index 94a9d6c8..91e35b16 100644
--- a/src/frontend/src/views/Projects/index.tsx
+++ b/src/frontend/src/views/Projects/index.tsx
@@ -25,7 +25,7 @@ const Projects = () => {
   );
   const [paginationState, setSetPaginationState] = useState({
     activePage: 1,
-    selectedNumberOfRows: 10,
+    selectedNumberOfRows: 12,
   });
 
   const handlePaginationState = (value: Record<string, number>) => {

From 464dcc30aec2f0ff94cca9fed8185102d990b6ad Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 14 Oct 2024 14:10:32 +0545
Subject: [PATCH 06/11] feat(project-dashboard): update map and project card
 style

---
 src/frontend/src/views/Projects/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/views/Projects/index.tsx b/src/frontend/src/views/Projects/index.tsx
index 91e35b16..086a761a 100644
--- a/src/frontend/src/views/Projects/index.tsx
+++ b/src/frontend/src/views/Projects/index.tsx
@@ -60,7 +60,7 @@ const Projects = () => {
       <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/3 md:naxatw-grid-cols-1 lg:naxatw-grid-cols-1 xl:naxatw-grid-cols-2' : 'naxatw-w-full naxatw-grid-cols-1 sm:naxatw-grid-cols-2 md:naxatw-grid-cols-3 lg:naxatw-grid-cols-5'}`}
+          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'}`}
           style={{ gridAutoRows: '19rem' }}
         >
           {isLoading ? (
@@ -93,7 +93,7 @@ const Projects = () => {
           )}
         </div>
         {showMap && (
-          <div className="naxatw-h-[70vh] naxatw-w-full naxatw-py-2 naxatw-shadow-xl md:naxatw-h-full md:naxatw-w-2/3">
+          <div className="naxatw-h-[70vh] naxatw-w-full naxatw-py-2 naxatw-shadow-xl md:naxatw-h-full md:naxatw-w-1/2">
             {!isLoading ? (
               <ProjectsMapSection projectList={projectListData?.results} />
             ) : (

From 553f41bf9881624a514660bcf1b4f1a71c37c288 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 14 Oct 2024 14:56:47 +0545
Subject: [PATCH 07/11] feat(task-description): update assest information api
 endpoint

---
 src/frontend/src/services/tasks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/services/tasks.ts b/src/frontend/src/services/tasks.ts
index d24703ad..d1bb3d2c 100644
--- a/src/frontend/src/services/tasks.ts
+++ b/src/frontend/src/services/tasks.ts
@@ -19,7 +19,7 @@ export const postTaskWaypoint = (payload: Record<string, any>) => {
   );
 };
 export const getTaskAssetsInfo = (projectId: string, taskId: string) =>
-  authenticated(api).get(`/projects/assets/${projectId}/${taskId}/`);
+  authenticated(api).get(`/projects/assets/${projectId}/?task_id=${taskId}`);
 
 export const postProcessImagery = (projectId: string, taskId: string) =>
   authenticated(api).post(`/projects/process_imagery/${projectId}/${taskId}/`);

From 14940ade86113d874fd423c48afd9d7c12e9693b Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 14 Oct 2024 16:00:50 +0545
Subject: [PATCH 08/11] feat(individual-project): get assets list

---
 src/frontend/src/api/projects.ts     | 14 +++++++++++++-
 src/frontend/src/services/project.ts |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/api/projects.ts b/src/frontend/src/api/projects.ts
index 4f31eac3..2a806316 100644
--- a/src/frontend/src/api/projects.ts
+++ b/src/frontend/src/api/projects.ts
@@ -1,7 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import { UseQueryOptions, useQuery } from '@tanstack/react-query';
 import { getProjectsList, getProjectDetail } from '@Services/createproject';
-import { getTaskStates } from '@Services/project';
+import { getAllAssetsUrl, getTaskStates } from '@Services/project';
 import { getUserProfileInfo } from '@Services/common';
 
 export const useGetProjectsListQuery = (
@@ -61,3 +61,15 @@ export const useGetUserDetailsQuery = (
     ...queryOptions,
   });
 };
+
+export const useGetAllAssetsUrlQuery = (
+  projectId: string,
+  queryOptions?: Partial<UseQueryOptions>,
+) => {
+  return useQuery({
+    queryKey: ['all-assets-url'],
+    queryFn: () => getAllAssetsUrl(projectId),
+    select: (data: any) => data.data,
+    ...queryOptions,
+  });
+};
diff --git a/src/frontend/src/services/project.ts b/src/frontend/src/services/project.ts
index 8281f0ff..5b387657 100644
--- a/src/frontend/src/services/project.ts
+++ b/src/frontend/src/services/project.ts
@@ -12,3 +12,6 @@ export const postTaskStatus = (payload: Record<string, any>) => {
 };
 export const getRequestedTasks = () =>
   authenticated(api).get('/tasks/requested_tasks/pending');
+
+export const getAllAssetsUrl = (projectId: string) =>
+  authenticated(api).get(`/projects/assets/${projectId}`);

From b064de0d5ad6953113d15a4a7cccb396a1cabacb Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 14 Oct 2024 16:05:44 +0545
Subject: [PATCH 09/11] feat(individual-project):fetch all assets and modify
 project details to insert each assets on respective task detail

---
 .../Contributions/TableSection/index.tsx           |  4 ++--
 src/frontend/src/views/IndividualProject/index.tsx | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/components/IndividualProject/Contributions/TableSection/index.tsx b/src/frontend/src/components/IndividualProject/Contributions/TableSection/index.tsx
index 14c94cd8..5ca11f17 100644
--- a/src/frontend/src/components/IndividualProject/Contributions/TableSection/index.tsx
+++ b/src/frontend/src/components/IndividualProject/Contributions/TableSection/index.tsx
@@ -67,8 +67,8 @@ export default function TableSection({ isFetching }: { isFetching: boolean }) {
           user: curr?.name || '-',
           task_mapped: `Task# ${curr?.project_task_index}`,
           task_state: curr?.state,
-          assets_url: curr?.assets_url,
-          image_count: curr?.image_count,
+          assets_url: curr?.assetsDetail?.assets_url,
+          image_count: curr?.assetsDetail?.image_count,
         },
       ];
     }, []);
diff --git a/src/frontend/src/views/IndividualProject/index.tsx b/src/frontend/src/views/IndividualProject/index.tsx
index cfe2d170..d17b037e 100644
--- a/src/frontend/src/views/IndividualProject/index.tsx
+++ b/src/frontend/src/views/IndividualProject/index.tsx
@@ -1,6 +1,9 @@
 /* eslint-disable jsx-a11y/interactive-supports-focus */
 /* eslint-disable jsx-a11y/click-events-have-key-events */
-import { useGetProjectsDetailQuery } from '@Api/projects';
+import {
+  useGetAllAssetsUrlQuery,
+  useGetProjectsDetailQuery,
+} from '@Api/projects';
 import Tab from '@Components/common/Tabs';
 import {
   Contributions,
@@ -43,14 +46,23 @@ const IndividualProject = () => {
     state => state.project.individualProjectActiveTab,
   );
 
+  const { data: allUrls, isFetching } = useGetAllAssetsUrlQuery(id as string);
+
+  const getTasksAssets = (taskID: string, assetsList: any[]) => {
+    if (!assetsList || !taskID) return null;
+    return assetsList.find((assets: any) => assets?.task_id === taskID);
+  };
+
   const { data: projectData, isFetching: isProjectDataFetching } =
     useGetProjectsDetailQuery(id as string, {
+      enabled: !!allUrls && !isFetching,
       onSuccess: (res: any) => {
         dispatch(
           setProjectState({
             // modify each task geojson and set locked user id and name to properties and save to redux state called taskData
             tasksData: res.tasks?.map((task: Record<string, any>) => ({
               ...task,
+              assetsDetail: getTasksAssets(task?.id, allUrls as any[]),
               outline: {
                 ...task.outline,
                 properties: {

From b6bb97c2cf5d30381a51ed312586b72fce10a841 Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 14 Oct 2024 16:49:54 +0545
Subject: [PATCH 10/11] feat(individual-project):add loader

---
 src/frontend/src/views/IndividualProject/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/views/IndividualProject/index.tsx b/src/frontend/src/views/IndividualProject/index.tsx
index d17b037e..b9826f4b 100644
--- a/src/frontend/src/views/IndividualProject/index.tsx
+++ b/src/frontend/src/views/IndividualProject/index.tsx
@@ -116,12 +116,12 @@ const IndividualProject = () => {
             {getActiveTabContent(
               individualProjectActiveTab,
               projectData as Record<string, any>,
-              isProjectDataFetching,
+              isProjectDataFetching || isFetching,
             )}
           </div>
         </div>
         <div className="naxatw-order-1 naxatw-h-[calc(100vh-10rem)] naxatw-w-full md:naxatw-order-2">
-          {isProjectDataFetching ? (
+          {isProjectDataFetching || isFetching ? (
             <Skeleton className="naxatw-h-full naxatw-w-full" />
           ) : (
             <MapSection projectData={projectData as Record<string, any>} />

From f0bbe7617f2a3fdb330042c9faf6134e211e34ec Mon Sep 17 00:00:00 2001
From: Sujit <sujitkarki703@gmail.com>
Date: Mon, 14 Oct 2024 17:11:34 +0545
Subject: [PATCH 11/11] fix(project-details): add `/` on api endpoint

---
 src/frontend/src/services/project.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/services/project.ts b/src/frontend/src/services/project.ts
index 5b387657..c5db4348 100644
--- a/src/frontend/src/services/project.ts
+++ b/src/frontend/src/services/project.ts
@@ -14,4 +14,4 @@ export const getRequestedTasks = () =>
   authenticated(api).get('/tasks/requested_tasks/pending');
 
 export const getAllAssetsUrl = (projectId: string) =>
-  authenticated(api).get(`/projects/assets/${projectId}`);
+  authenticated(api).get(`/projects/assets/${projectId}/`);