@@ -13,6 +13,7 @@ import {
1313import { Add20Regular , CheckmarkCircle20Regular , Dismiss20Regular , CircleHalfFill20Regular , CheckboxChecked20Regular , DismissSquare20Regular } from "@fluentui/react-icons" ;
1414import React from "react" ;
1515import "../../styles/TaskDetails.css" ;
16+ import { TaskService } from "@/services" ;
1617
1718const TaskDetails : React . FC < TaskDetailsProps > = ( {
1819 planData,
@@ -69,20 +70,34 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
6970 </ div >
7071 </ div >
7172 </ div >
72-
73+ < Divider />
7374 < div className = "task-details-subtask-list" >
74- { subTasks . map ( ( subtask ) => (
75- < div key = { subtask . id } className = "task-details-subtask-item" >
76- < div className = "task-details-status-icon" >
77- { renderStatusIcon ( subtask . status ) }
78- </ div >
79- < div className = "task-details-subtask-content" >
80- < span className = "task-details-subtask-name" > { subtask . action } </ span >
81- < CheckboxChecked20Regular onClick = { ( ) => OnApproveStep ( subtask ) } className = "task-details-checkbox-icon" />
82- < DismissSquare20Regular onClick = { ( ) => OnRejectStep ( subtask ) } className = "task-details-dismiss-icon" />
75+ { subTasks . map ( ( subtask ) => {
76+ const { description, functionOrDetails } = TaskService . splitSubtaskAction ( subtask . action ) ;
77+
78+
79+ return (
80+
81+ < div key = { subtask . id } className = "task-details-subtask-item" >
82+ < div className = "task-details-status-icon" >
83+ { renderStatusIcon ( subtask . status ) }
84+ </ div >
85+ < div className = "task-details-subtask-content" >
86+ < span className = "task-details-subtask-name" > { description } </ span >
87+ < div className = "task-details-subtask-actions" >
88+ < CheckboxChecked20Regular
89+ onClick = { ( ) => OnApproveStep ( subtask ) }
90+ className = "task-details-checkbox-icon"
91+ />
92+ < DismissSquare20Regular
93+ onClick = { ( ) => OnRejectStep ( subtask ) }
94+ className = "task-details-dismiss-icon"
95+ />
96+ </ div >
97+ </ div >
8398 </ div >
84- </ div >
85- ) ) }
99+ ) ;
100+ } ) }
86101 </ div >
87102 </ div >
88103
0 commit comments