Skip to content

Commit e782a61

Browse files
fengju0213fengju0213
committed
update
1 parent 4a4d59a commit e782a61

5 files changed

Lines changed: 538 additions & 418 deletions

File tree

‎src/components/ChatBox/ProjectSection.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,13 @@ function groupMessagesByQuery(messages: any[]) {
152152
otherMessages: []
153153
};
154154
}
155-
} else {
155+
} else {
156156
// Other messages (assistant responses, errors, etc.)
157+
// Skip decompose_text messages as they are handled separately in UserQueryGroup
158+
if (message.step === 'decompose_text') {
159+
return;
160+
}
161+
157162
if (currentGroup) {
158163
currentGroup.otherMessages.push(message);
159164
} else {

‎src/components/ChatBox/TaskBox/TaskCard.tsx‎

Lines changed: 59 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export function TaskCard({
6060
if (!chatStore) {
6161
return <div>Loading...</div>;
6262
}
63-
63+
6464

6565
const [selectedState, setSelectedState] = useState<TaskStateType>("all");
6666
const [filterTasks, setFilterTasks] = useState<any[]>([]);
@@ -81,7 +81,7 @@ export function TaskCard({
8181
task.status !== "completed" &&
8282
task.status !== "skipped" &&
8383
task.status !== "waiting" &&
84-
task.status !== ""
84+
task.status !== ""
8585
);
8686
case "pending":
8787
return (
@@ -106,16 +106,16 @@ export function TaskCard({
106106
);
107107
}, [chatStore.tasks[chatStore.activeTaskId as string].status]);
108108

109-
useEffect(() => {
110-
if (
111-
chatStore.tasks[chatStore.activeTaskId as string].activeWorkSpace ===
112-
"workflow"
113-
) {
114-
setIsExpanded(false);
115-
} else {
116-
setIsExpanded(true);
117-
}
118-
}, [chatStore.tasks[chatStore.activeTaskId as string].activeWorkSpace]);
109+
// useEffect(() => {
110+
// if (
111+
// chatStore.tasks[chatStore.activeTaskId as string].activeWorkSpace ===
112+
// "workflow"
113+
// ) {
114+
// setIsExpanded(false);
115+
// } else {
116+
// setIsExpanded(true);
117+
// }
118+
// }, [chatStore.tasks[chatStore.activeTaskId as string].activeWorkSpace]);
119119

120120
// Improved height calculation logic
121121
useEffect(() => {
@@ -299,41 +299,40 @@ export function TaskCard({
299299
>
300300
<ChevronDown
301301
size={16}
302-
className={`transition-transform duration-300 ${
303-
isExpanded ? "rotate-180" : ""
304-
}`}
302+
className={`transition-transform duration-300 ${isExpanded ? "rotate-180" : ""
303+
}`}
305304
/>
306305
</Button>
307306
</div>
308307
)}
309308
</div>
310309
</div>
311310
)}
312-
311+
313312
<div className="relative">
314-
{taskType === 1 && (
315-
<div className="mt-sm flex flex-col px-sm animate-in fade-in-0 slide-in-from-bottom-4 duration-500 ease-out">
316-
{taskInfo.map((task, taskIndex) => (
317-
<div
318-
key={`task-${taskIndex}`}
319-
className="animate-in fade-in-0 slide-in-from-left-2 duration-300"
320-
>
321-
<TaskItem
322-
taskInfo={task}
323-
taskIndex={taskIndex}
324-
animate={
325-
taskType === 1 &&
326-
task.streaming &&
327-
!seenTaskIdsRef.current.has(task.id)
328-
}
329-
streaming={task.streaming}
330-
onUpdate={(content) => onUpdateTask(taskIndex, content)}
331-
onDelete={() => onDeleteTask(taskIndex)}
332-
/>
333-
</div>
334-
))}
335-
</div>
336-
)}
313+
{taskType === 1 && (
314+
<div className="mt-sm flex flex-col px-sm animate-in fade-in-0 slide-in-from-bottom-4 duration-500 ease-out">
315+
{taskInfo.map((task, taskIndex) => (
316+
<div
317+
key={`task-${taskIndex}`}
318+
className="animate-in fade-in-0 slide-in-from-left-2 duration-300"
319+
>
320+
<TaskItem
321+
taskInfo={task}
322+
taskIndex={taskIndex}
323+
animate={
324+
taskType === 1 &&
325+
task.streaming &&
326+
!seenTaskIdsRef.current.has(task.id)
327+
}
328+
streaming={task.streaming}
329+
onUpdate={(content) => onUpdateTask(taskIndex, content)}
330+
onDelete={() => onDeleteTask(taskIndex)}
331+
/>
332+
</div>
333+
))}
334+
</div>
335+
)}
337336
{taskType === 2 && (
338337
<div
339338
ref={contentRef}
@@ -376,38 +375,35 @@ export function TaskCard({
376375
}
377376
}}
378377
key={`taskList-${task.id}`}
379-
className={`rounded-lg flex gap-2 py-sm px-sm transition-all duration-300 ease-in-out animate-in fade-in-0 slide-in-from-left-2 ${
380-
task.status === "completed"
378+
className={`rounded-lg flex gap-2 py-sm px-sm transition-all duration-300 ease-in-out animate-in fade-in-0 slide-in-from-left-2 ${task.status === "completed"
381379
? "bg-green-50"
382380
: task.status === "failed"
383-
? "bg-task-fill-error"
384-
: task.status === "running"
385-
? "bg-zinc-50"
386-
: task.status === "blocked"
387-
? "bg-task-fill-warning"
388-
: "bg-zinc-50"
389-
} border border-solid border-transparent cursor-pointer ${
390-
task.status === "completed"
381+
? "bg-task-fill-error"
382+
: task.status === "running"
383+
? "bg-zinc-50"
384+
: task.status === "blocked"
385+
? "bg-task-fill-warning"
386+
: "bg-zinc-50"
387+
} border border-solid border-transparent cursor-pointer ${task.status === "completed"
391388
? "hover:border-bg-fill-success-primary"
392389
: task.status === "failed"
393-
? "hover:border-task-border-focus-error"
394-
: task.status === "running"
395-
? "hover:border-border-primary"
396-
: task.status === "blocked"
397-
? "hover:border-task-border-focus-warning"
398-
: "border-transparent"
399-
}
390+
? "hover:border-task-border-focus-error"
391+
: task.status === "running"
392+
? "hover:border-border-primary"
393+
: task.status === "blocked"
394+
? "hover:border-task-border-focus-warning"
395+
: "border-transparent"
396+
}
400397
`}
401398
>
402399
<div className="pt-0.5">
403400
{task.status === "running" && (
404401
<LoaderCircle
405402
size={16}
406-
className={`text-icon-information ${
407-
chatStore.tasks[
403+
className={`text-icon-information ${chatStore.tasks[
408404
chatStore.activeTaskId as string
409405
].status === "running" && "animate-spin"
410-
} `}
406+
} `}
411407
/>
412408
)}
413409
{task.status === "skipped" && (
@@ -440,13 +436,12 @@ export function TaskCard({
440436
</div>
441437
<div className="flex-1 flex flex-col items-start justify-center">
442438
<div
443-
className={` w-full break-words whitespace-pre-line ${
444-
task.status === "failed"
439+
className={` w-full break-words whitespace-pre-line ${task.status === "failed"
445440
? "text-text-cuation-default"
446441
: task.status === "blocked"
447-
? "text-text-body"
448-
: "text-text-primary"
449-
} text-sm font-medium leading-13 `}
442+
? "text-text-body"
443+
: "text-text-primary"
444+
} text-sm font-medium leading-13 `}
450445
>
451446
{task.content}
452447
</div>

0 commit comments

Comments
 (0)