Skip to content

fix: p2/p3 Bug fixes #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: fix: Merging dev chnages for v2 version
merged 3 commits into from
Jul 1, 2025
Merged

fix: p2/p3 Bug fixes #292

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f7e81b
p2/p3 Bug fixes
Ravikirana-Microsoft Jun 30, 2025
1929b00
minifiest file not using anywhere removed linking
Ravikirana-Microsoft Jun 30, 2025
516dac4
comments fix
Ravikirana-Microsoft Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
content="MACAE - Multi-Agent Custom Automation Engine"
/>
<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />
<!-- <link rel="manifest" href="/manifest.json" /> -->
<title>Multi-Agent - Custom Automation Engine</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
content="MACAE - Multi-Agent Custom Automation Engine"
/>
<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />
<!-- <link rel="manifest" href="/manifest.json" /> -->
<title>MACAE</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/api/apiService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export class APIService {

if (useCache) {
const cachedPlan = this._cache.get<{ plan_with_steps: PlanWithSteps; messages: PlanMessage[] }>(cacheKey);
//if (cachedPlan) return cachedPlan;
if (cachedPlan) return cachedPlan;

return this._requestTracker.trackRequest(cacheKey, fetcher);
}
Expand Down
8 changes: 7 additions & 1 deletion src/frontend/src/components/content/TaskDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,13 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
</div>
</div>
<div>
<Body1Strong>{planData.plan.initial_goal}</Body1Strong>
<Tooltip content={planData.plan.initial_goal} relationship={"label"}>
<Body1Strong
className="goal-text"
>
{planData.plan.initial_goal}
</Body1Strong>
</Tooltip>
<br />
<Text size={200}>
{completedCount} of {total} completed
Expand Down
7 changes: 4 additions & 3 deletions src/frontend/src/components/content/TaskList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ const TaskList: React.FC<TaskListProps> = ({
<div className="task-name-truncated" title={task.name}>
{task.name}
</div>


{task.date && (
{task.date && task.status == "completed" &&(
<Caption1 className="task-list-task-date">{task.date}</Caption1>
)}
{task.status == "inprogress" &&(
<Caption1 className="task-list-task-date">{`${task?.completed_steps} of ${task?.total_steps} completed`}</Caption1>
)}
</div>
<Menu>
<MenuTrigger>
Expand Down
2 changes: 2 additions & 0 deletions src/frontend/src/models/taskList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ export interface Task {
name: string;
status: 'inprogress' | 'completed';
date?: string;
completed_steps?: number;
total_steps?: number;
}

export interface TaskListProps {
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/pages/PlanPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const PlanPage: React.FC = () => {
}

setError(null);
const data = await PlanDataService.fetchPlanData(planId);
const data = await PlanDataService.fetchPlanData(planId,navigate);
console.log("Fetched plan data:", data);
setPlanData(data);
} catch (err) {
Expand Down Expand Up @@ -146,7 +146,7 @@ const PlanPage: React.FC = () => {


useEffect(() => {
loadPlanData();
loadPlanData(true);
}, [loadPlanData]);

const handleNewTaskButton = () => {
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/services/PlanDataService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ export class PlanDataService { /**
* @param planId Plan ID to fetch
* @returns Promise with processed plan data
*/
static async fetchPlanData(planId: string): Promise<ProcessedPlanData> {
static async fetchPlanData(planId: string,useCache:boolean): Promise<ProcessedPlanData> {
try {
// Use optimized getPlanById method for better performance
const planBody = await apiService.getPlanById(planId);
const planBody = await apiService.getPlanById(planId,useCache);
return this.processPlanData(planBody.plan_with_steps, planBody.messages || []);
} catch (error) {
console.log('Failed to fetch plan data:', error);
Expand Down
2 changes: 2 additions & 0 deletions src/frontend/src/services/TaskService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ export class TaskService {
const task: Task = {
id: plan.session_id,
name: plan.initial_goal,
completed_steps: plan.completed,
total_steps: plan.total_steps,
status: apiService.isPlanComplete(plan) ? 'completed' : 'inprogress',
date: new Date(plan.timestamp).toLocaleDateString('en-US', {
month: 'short',
Expand Down
10 changes: 10 additions & 0 deletions src/frontend/src/styles/TaskDetails.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,14 @@
}
.strikethrough {
text-decoration: line-through;
}

.goal-text {
display: -webkit-box !important;
-webkit-line-clamp: 2 !important;
-webkit-box-orient: vertical !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
white-space: normal !important;
max-width: 300px;
}
Loading