update panel behavior

Author: Fr4nc3

src/frontend_react/src/components/content/PlanChat.tsx

@@ -39,7 +39,6 @@ const PlanChat: React.FC<PlanChatProps> = ({
     const messagesContainerRef = useRef<HTMLDivElement>(null);
     const inputContainerRef = useRef<HTMLDivElement>(null);
 
-    const sendMessage = async () => { };
 
     const scrollToBottom = () => { };
     if (!planData) return <Spinner size="large" />;

src/frontend_react/src/components/content/PlanPanelRight.tsx

@@ -13,7 +13,6 @@ const PlanPanelRight: React.FC<TaskDetailsProps> = ({
     loading,
     submittingChatDisableInput,
     OnApproveStep,
-    OnRejectStep,
     processingSubtaskId
 }) => {
     if (!planData) return null;
@@ -30,7 +29,6 @@ const PlanPanelRight: React.FC<TaskDetailsProps> = ({
                 <TaskDetails
                     planData={planData}
                     OnApproveStep={OnApproveStep}
-                    OnRejectStep={OnRejectStep}
                     submittingChatDisableInput={submittingChatDisableInput}
                     processingSubtaskId={processingSubtaskId}
                     loading={loading}

src/frontend_react/src/components/content/TaskDetails.tsx

@@ -28,10 +28,9 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
     planData,
     loading,
     OnApproveStep,
-    OnRejectStep,
 }) => {
     const [steps, setSteps] = useState(planData.steps || []);
-    const [completedCCount, setCompletedCount] = useState(
+    const [completedCount, setCompletedCount] = useState(
         planData?.plan.completed || 0
     );
     const [total, setTotal] = useState(planData?.plan.total_steps || 1);
@@ -74,11 +73,11 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
             // Update local state to reflect changes immediately
 
             setSteps(updatedSteps);
-            setCompletedCount(completedCCount + 1); // Increment completed count
-            setProgress((completedCCount + 1) / total); // Update progress
+            setCompletedCount(completedCount + 1); // Increment completed count
+            setProgress((completedCount + 1) / total); // Update progress
             // Then call the main approval function
             // This could be your existing OnApproveStep function that handles API calls, etc.
-            await OnApproveStep(updatedStep);
+            await OnApproveStep(updatedStep, total, completedCount + 1, true);
 
 
         } catch (error) {
@@ -103,11 +102,11 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
 
             // Update local state to reflect changes immediately
             setSteps(updatedSteps);
-            setCompletedCount(completedCCount + 1); // Increment completed count
-            setProgress((completedCCount + 1) / total); // Update progress
+            setCompletedCount(completedCount + 1); // Increment completed count
+            setProgress((completedCount + 1) / total); // Update progress
             // Then call the main rejection function
             // This could be your existing OnRejectStep function that handles API calls, etc.
-            await OnRejectStep(updatedStep);
+            await OnApproveStep(updatedStep, total, completedCount + 1, false);
 
         } catch (error) {
             console.error('Error in pre-rejection step:', error);
@@ -149,7 +148,7 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
                             <Body1Strong>{planData.plan.initial_goal}</Body1Strong>
                             <br />
                             <Text size={200}>
-                                {completedCCount} of {total} completed
+                                {completedCount} of {total} completed
                             </Text>
                         </div>
                     </div>

src/frontend_react/src/models/planPanelLeft.tsx

@@ -1,4 +1,4 @@
 export interface PlanPanelLefProps {
-
+    reloadTasks?: boolean;
     onNewTaskButton: () => void;
 }

src/frontend_react/src/models/taskDetails.tsx

@@ -25,6 +25,5 @@ export interface TaskDetailsProps {
     loading: boolean;
     submittingChatDisableInput: boolean;
     processingSubtaskId: string | null;
-    OnApproveStep: (step: Step) => void;
-    OnRejectStep: (step: Step) => void;
+    OnApproveStep: (step: Step, total: number, completed: number, approve: boolean) => void;
 }

src/frontend_react/src/pages/PlanPage.tsx

@@ -55,7 +55,7 @@ const PlanPage: React.FC = () => {
     const [processingSubtaskId, setProcessingSubtaskId] = useState<string | null>(
         null
     );
-
+    const [reloadLeftList, setReloadLeftList] = useState(true);
 
     const [loadingMessage, setLoadingMessage] = useState(loadingMessages[0]);
 
@@ -99,12 +99,13 @@ const PlanPage: React.FC = () => {
 
     const handleOnchatSubmit = useCallback(
         async (chatInput: string) => {
-            setInput("");
+
             console.log("handleOnchatSubmit called with input:", chatInput);
             if (!chatInput.trim()) {
                 showToast("Please enter a clarification.", "error");
                 return;
             }
+            setInput("");
             if (!planData?.plan) return;
             setSubmitting(true);
             showToast("Submitting clarification...", "progress");
@@ -129,17 +130,23 @@ const PlanPage: React.FC = () => {
     );
 
     const handleApproveStep = useCallback(
-        async (step: Step) => {
+        async (step: Step, total: number, completed: number, approve: boolean) => {
             setProcessingSubtaskId(step.id);
-            showToast("Submitting approval...", "progress");
+            const toastMessage = approve ? "Approving step..." : "Rejecting step...";
+            showToast(toastMessage, "progress");
             setSubmitting(true);
             try {
-                await PlanDataService.stepStatus(step, true);
-                showToast("Step approved successfully.", "success");
+                await PlanDataService.stepStatus(step, approve);
+                showToast(`Step ${approve ? "approved" : "rejected"} successfully.`, "success");
+                if (total === completed) {
+                    setReloadLeftList(true);
+                } else {
+                    setReloadLeftList(false);
+                }
                 await loadPlanData(false);
             } catch (error) {
-                showToast("Failed to approve step.", "error");
-                console.error("Failed to reject step:", error);
+                showToast(`Failed to ${approve ? "approve" : "reject"} step.`, "error");
+                console.error(`Failed to ${approve ? "approve" : "reject"} step:`, error);
             } finally {
                 setProcessingSubtaskId(null);
                 setSubmitting(false);
@@ -148,25 +155,6 @@ const PlanPage: React.FC = () => {
         [loadPlanData]
     );
 
-    const handleRejectStep = useCallback(
-        async (step: Step) => {
-            setProcessingSubtaskId(step.id);
-            showToast("Submitting rejection...", "progress");
-            setSubmitting(true);
-            try {
-                await PlanDataService.stepStatus(step, false);
-                showToast("Step rejected successfully.", "success");
-                await loadPlanData(false);
-            } catch (error) {
-                showToast("Failed to reject step.", "error");
-                console.error("Failed to reject step:", error);
-            } finally {
-                setProcessingSubtaskId(null);
-                setSubmitting(false);
-            }
-        },
-        [loadPlanData]
-    );
 
     useEffect(() => {
         loadPlanData();
@@ -225,7 +213,6 @@ const PlanPage: React.FC = () => {
                 <PlanPanelRight
                     planData={planData}
                     OnApproveStep={handleApproveStep}
-                    OnRejectStep={handleRejectStep}
                     submittingChatDisableInput={submittingChatDisableInput}
                     processingSubtaskId={processingSubtaskId}
                     loading={loading}