Skip to content

Commit 8407007

Browse files
committed
conciliate merge from eunsoo
1 parent 8ef3653 commit 8407007

File tree

7 files changed

+29
-34
lines changed

7 files changed

+29
-34
lines changed

src/frontend_react/src/components/content/HomeInput.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const HomeInput: React.FC<HomeInputProps> = ({
2828
const [input, setInput] = useState("");
2929
const textareaRef = useRef<HTMLTextAreaElement>(null);
3030
const navigate = useNavigate();
31-
const { showToast } = useInlineToaster();
31+
const { showToast, dismissToast } = useInlineToaster();
3232

3333
const resetTextarea = () => {
3434
setInput("");
@@ -46,7 +46,7 @@ const HomeInput: React.FC<HomeInputProps> = ({
4646
const handleSubmit = async () => {
4747
if (input.trim()) {
4848
setSubmitting(true);
49-
showToast("Creating a plan", "progress");
49+
let id = showToast("Creating a plan", "progress");
5050
try {
5151
const response = await TaskService.submitInputTask(input.trim());
5252

@@ -60,16 +60,21 @@ const HomeInput: React.FC<HomeInputProps> = ({
6060
if (response.plan_id && response.plan_id !== null) {
6161
// plan_id is valid (not null or undefined)
6262
showToast("Plan created!", "success");
63+
dismissToast(id);
6364
navigate(`/plan/${response.plan_id}`);
6465
} else {
6566
// plan_id is not valid, handle accordingly
6667
console.log('Invalid plan:', response.status);
68+
6769
showToast("Failed to create plan", "error");
70+
dismissToast(id);
6871
}
6972
} catch (error) {
7073
console.error("Failed to create plan:", error);
74+
dismissToast(id);
7175
showToast("Something went wrong", "error");
7276
} finally {
77+
setInput("");
7378
setSubmitting(false);
7479
}
7580
}
@@ -144,3 +149,4 @@ const HomeInput: React.FC<HomeInputProps> = ({
144149
};
145150

146151
export default HomeInput;
152+

src/frontend_react/src/components/content/PlanPanelLeft.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
125125

126126
</div>
127127
<Body1Strong>New task</Body1Strong>
128-
128+
129129
</div>
130130

131131
<br />
@@ -138,13 +138,11 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
138138
/>
139139

140140
<PanelFooter>
141-
{userInfo && (
142-
<PanelUserCard
143-
name={userInfo.user_first_last_name || ""}
144-
alias={userInfo.user_email || ""}
145-
size={32} // Default=32
146-
/>
147-
)}
141+
<PanelUserCard
142+
name={userInfo ? userInfo.user_first_last_name : "Guess"}
143+
alias={userInfo ? userInfo.user_email : ""}
144+
size={32}
145+
/>
148146
</PanelFooter>
149147
</PanelLeft>
150148
</div>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
import React from "react";
2-
3-
import { Button } from "@fluentui/react-components";
4-
import { History20Filled, MoreHorizontalRegular, TaskListSquareLtr20Regular, TaskListSquareLtrFilled } from "@fluentui/react-icons";
52
import PanelRight from "@/coral/components/Panels/PanelRight";
6-
import PanelRightToolbar from "@/coral/components/Panels/PanelRightToolbar";
73
import TaskDetails from "./TaskDetails";
84
import { TaskDetailsProps } from "@/models";
95

10-
116
const PlanPanelRight: React.FC<TaskDetailsProps> = ({
127
planData,
138
loading,

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,10 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
154154
</div>
155155
<div className="task-details-subtask-content">
156156
<Body1
157-
className={`task-details-subtask-description ${
158-
step.human_approval_status === "rejected"
159-
? "strikethrough"
160-
: ""
161-
}`}
157+
className={`task-details-subtask-description ${step.human_approval_status === "rejected"
158+
? "strikethrough"
159+
: ""
160+
}`}
162161
>
163162
{description}{" "}
164163
{functionOrDetails && (
@@ -171,7 +170,7 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
171170
<div>
172171
<Tooltip relationship="label" content="Approve">
173172
<Button
174-
173+
175174
icon={<Checkmark20Regular />}
176175
appearance="subtle"
177176
onClick={

src/frontend_react/src/components/content/TaskList.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ import CoralAccordionItem from "@/coral/components/CoralAccordion/CoralAccordion
1616
import CoralAccordionHeader from "@/coral/components/CoralAccordion/CoralAccordionHeader";
1717
import CoralAccordionPanel from "@/coral/components/CoralAccordion/CoralAccordionPanel";
1818

19-
20-
21-
22-
2319
const TaskList: React.FC<TaskListProps> = ({
2420
inProgressTasks,
2521
completedTasks,
@@ -38,9 +34,9 @@ const TaskList: React.FC<TaskListProps> = ({
3834
>
3935
<div className="sideNavTick" />
4036
<div className="left">
41-
<div className="task-name-truncated" title={task.name}>
42-
{task.name}
43-
</div>
37+
<div className="task-name-truncated" title={task.name}>
38+
{task.name}
39+
</div>
4440

4541

4642
{task.date && (

src/frontend_react/src/pages/HomePage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ const HomePage: React.FC = () => {
5454
<Content>
5555
<ContentToolbar
5656
panelTitle={"Multi-Agent Planner"}
57-
// panelIcon={<Sparkle20Filled />}
5857
></ContentToolbar>
5958
<HomeInput
6059
onInputSubmit={handleNewTask}

src/frontend_react/src/pages/PlanPage.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import InlineToaster, {
3737
} from "../components/toast/InlineToaster";
3838
import Octo from "../coral/imports/Octopus.png"; // 🐙 Animated PNG loader
3939
import PanelRightToggles from "@/coral/components/Header/PanelRightToggles";
40-
import {TaskListSquareLtr } from "@/coral/imports/bundleicons";
40+
import { TaskListSquareLtr } from "@/coral/imports/bundleicons";
4141
import LoadingMessage, { loadingMessages } from "@/coral/components/LoadingMessage";
4242

4343
/**
@@ -47,7 +47,7 @@ import LoadingMessage, { loadingMessages } from "@/coral/components/LoadingMessa
4747
const PlanPage: React.FC = () => {
4848
const { planId } = useParams<{ planId: string }>();
4949
const navigate = useNavigate();
50-
const { showToast,dismissToast } = useInlineToaster();
50+
const { showToast, dismissToast } = useInlineToaster();
5151

5252
const [input, setInput] = useState("");
5353
const [planData, setPlanData] = useState<ProcessedPlanData | any>(null);
@@ -110,17 +110,19 @@ const PlanPage: React.FC = () => {
110110
setInput("");
111111
if (!planData?.plan) return;
112112
setSubmitting(true);
113-
showToast("Submitting clarification", "progress");
113+
let id = showToast("Submitting clarification", "progress");
114114
try {
115115
await PlanDataService.submitClarification(
116116
planData.plan.id,
117117
planData.plan.session_id,
118118
chatInput
119119
);
120120
setInput("");
121+
dismissToast(id);
121122
showToast("Clarification submitted successfully", "success");
122123
await loadPlanData(false);
123124
} catch (error) {
125+
dismissToast(id);
124126
showToast("Failed to submit clarification", "error");
125127
console.error("Failed to submit clarification:", error);
126128
} finally {
@@ -148,7 +150,7 @@ const PlanPage: React.FC = () => {
148150
}
149151
await loadPlanData(false);
150152
} catch (error) {
151-
dismissToast(id);
153+
dismissToast(id);
152154
showToast(`Failed to ${approve ? "approve" : "reject"} step`, "error");
153155
console.error(`Failed to ${approve ? "approve" : "reject"} step:`, error);
154156
} finally {
@@ -194,7 +196,7 @@ const PlanPage: React.FC = () => {
194196
<>
195197
<ContentToolbar
196198
panelTitle={planData?.plan?.initial_goal || "Plan Details"}
197-
// panelIcon={<ChatMultiple20Regular />}
199+
// panelIcon={<ChatMultiple20Regular />}
198200
>
199201
<PanelRightToggles>
200202
<ToggleButton

0 commit comments

Comments
 (0)