fix: resolved image processing issues, state management for color, an…

…d dashboard listing
hotosm · Dec 12, 2024 · 822a86e · 822a86e
1 parent af030d9
commit 822a86e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
@@ -525,7 +525,7 @@ async def odm_webhook(
         current_state = await task_logic.get_task_state(db, dtm_project_id, dtm_task_id)
         current_state_value = State[current_state.get("state")]
         match current_state_value:
-            case State.IMAGE_UPLOADED:
+            case State.IMAGE_PROCESSING_STARTED:
                 log.info(
                     f"Task ID: {task_id}, Status: already IMAGE_UPLOADED - no update needed."
                 )
@@ -537,7 +537,7 @@ async def odm_webhook(
                     dtm_project_id,
                     dtm_task_id,
                     dtm_user_id,
-                    State.IMAGE_UPLOADED,
+                    State.IMAGE_PROCESSING_STARTED,
                     "Task completed.",
                 )
 
@@ -553,7 +553,7 @@ async def odm_webhook(
                     dtm_project_id,
                     dtm_task_id,
                     dtm_user_id,
-                    State.IMAGE_UPLOADED,
+                    State.IMAGE_PROCESSING_FAILED,
                     "Task completed.",
                 )
 
@@ -572,7 +572,7 @@ async def odm_webhook(
                 dtm_task_id,
                 dtm_user_id,
                 "Image processing failed.",
-                State.IMAGE_UPLOADED,
+                State.IMAGE_PROCESSING_STARTED,
                 State.IMAGE_PROCESSING_FAILED,
                 timestamp(),
             )

diff --git a/src/backend/app/tasks/task_logic.py b/src/backend/app/tasks/task_logic.py
@@ -29,7 +29,7 @@ async def get_task_stats(db: Connection, user_data: AuthUser):
             raw_sql = """
                 SELECT
                     COUNT(CASE WHEN te.state = 'REQUEST_FOR_MAPPING' THEN 1 END) AS request_logs,
-                    COUNT(CASE WHEN te.state IN ('LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED', 'IMAGE_PROCESSING_FAILED') THEN 1 END) AS ongoing_tasks,
+                    COUNT(CASE WHEN te.state IN ('LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED', 'IMAGE_PROCESSING_STARTED','IMAGE_PROCESSING_FAILED') THEN 1 END) AS ongoing_tasks,
                     COUNT(CASE WHEN te.state = 'IMAGE_PROCESSING_FINISHED' THEN 1 END) AS completed_tasks,
                     COUNT(CASE WHEN te.state = 'UNFLYABLE_TASK' THEN 1 END) AS unflyable_tasks
 
@@ -642,7 +642,7 @@ async def handle_event(
                 task_id,
                 user_id,
                 f"Task image processing started by user {user_data.name}.",
-                State[state],
+                State.IMAGE_UPLOADED,
                 State.IMAGE_PROCESSING_STARTED,
                 detail.updated_at,
             )

diff --git a/src/frontend/src/components/IndividualProject/MapSection/Legend.tsx b/src/frontend/src/components/IndividualProject/MapSection/Legend.tsx
@@ -30,7 +30,7 @@ const Legend = () => {
             </div>
             <div className="naxatw-flex naxatw-gap-2">
               <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#9C77B2] naxatw-opacity-60" />
-              <p className="naxatw-text-sm">Image Processing</p>
+              <p className="naxatw-text-sm">Image Processing Started</p>
             </div>
             <div className="naxatw-flex naxatw-gap-2">
               <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#D73F3F] naxatw-opacity-60" />

diff --git a/src/frontend/src/components/IndividualProject/MapSection/index.tsx b/src/frontend/src/components/IndividualProject/MapSection/index.tsx
@@ -151,10 +151,12 @@ const MapSection = ({ projectData }: { projectData: Record<string, any> }) => {
             return 'This task is not flyable';
           case 'IMAGE_UPLOADED':
             return `This task's Images has been uploaded ${properties.locked_user_name ? `by ${userDetails?.id === properties?.locked_user_id ? 'you' : properties?.locked_user_name}` : ''}`;
-          case 'IMAGE_PROCESSED':
+          case 'IMAGE_PROCESSING_STARTED':
+              return `This task is started ${properties.locked_user_name ? `by ${userDetails?.id === properties?.locked_user_id ? 'you' : properties?.locked_user_name}` : ''}`;
+          case 'IMAGE_PROCESSING_FINISHED':
             return `This task is completed ${properties.locked_user_name ? `by ${userDetails?.id === properties?.locked_user_id ? 'you' : properties?.locked_user_name}` : ''}`;
           case 'IMAGE_PROCESSING_FAILED':
-            return `This task's image processing is failed started ${properties.locked_user_name ? `by ${userDetails?.id === properties?.locked_user_id ? 'you' : properties?.locked_user_name}` : ''}`;
+            return `The image processing task started ${userDetails?.id === properties?.locked_user_id ? 'by you' : `by ${properties?.locked_user_name}`} has failed.`;
           default:
             return '';
         }

diff --git a/src/frontend/src/constants/index.ts b/src/frontend/src/constants/index.ts
@@ -94,7 +94,7 @@ export const rowsPerPageOptions = [
 
 export const taskStatusObj = {
   request_logs: ['REQUEST_FOR_MAPPING'],
-  ongoing: ['LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED', 'IMAGE_PROCESSING_FAILED'],
-  completed: ['IMAGE_PROCESSED'],
+  ongoing: ['LOCKED_FOR_MAPPING', 'IMAGE_UPLOADED', 'IMAGE_PROCESSING_STARTED', 'IMAGE_PROCESSING_FAILED'],
+  completed: ['IMAGE_PROCESSING_FINISHED'],
   unflyable: ['UNFLYABLE_TASK'],
 };
diff --git a/src/frontend/src/constants/projectDescription.ts b/src/frontend/src/constants/projectDescription.ts
@@ -25,7 +25,7 @@ export const getLayerOptionsByStatus = (status: string) => {
         'fill-opacity': 0.5,
       },
     },
-    IMAGE_PROCESSED: {
+    IMAGE_PROCESSING_FINISHED: {
       type: 'fill',
       paint: {
         'fill-color': '#ACD2C4',
@@ -94,7 +94,10 @@ export const showPrimaryButton = (
     case 'IMAGE_UPLOADED':
       if (lockedUser === currentUser || author === currentUser) return true;
       return false;
-    case 'IMAGE_PROCESSED':
+    case 'IMAGE_PROCESSING_STARTED':
+      if (lockedUser === currentUser || author === currentUser) return true;
+      return false;
+    case 'IMAGE_PROCESSING_FINISHED':
       return true;
     case 'IMAGE_PROCESSING_FAILED':
       if (lockedUser === currentUser || author === currentUser) return true;

diff --git a/src/frontend/src/utils/index.ts b/src/frontend/src/utils/index.ts
@@ -82,7 +82,7 @@ export const getFrontOverlap = (agl: number, forwardSpacing: number) => {
 // remove underscore and capitalize the word
 export const formatString = (value: string) => {
   if (!value) return '';
-  if (value === 'IMAGE_PROCESSED') return 'Completed';
+  if (value === 'IMAGE_PROCESSING_FINISHED') return 'Completed';
   return value
     .replace(/_/g, ' ')
     .toLowerCase()