mirror of
https://github.com/aljazceru/Auto-GPT.git
synced 2025-12-19 06:54:22 +01:00
Refactor TaskView to Support Combined Data and Test Suite Detail View
This commit introduces substantial improvements to the TaskView class to accommodate both tasks and test suites in a unified view. It also integrates the TestSuiteDetailView to display test suite details when a test suite is selected. Key Enhancements: 1. Modified the `initState` method to call `fetchAndCombineData()` from TaskViewModel, thereby populating the combined data source. 2. Replaced the ListView that was rendering tasks with a ListView that can render both tasks and test suites. 3. Introduced conditional rendering for TestSuiteDetailView when a test suite is selected. 4. Updated onTap actions to select and deselect tasks and test suites appropriately. 5. Moved to using a Stack layout to allow overlay of TestSuiteDetailView on top of the existing layout. This refactor enhances the TaskView's capabilities to manage and display both tasks and test suites, offering a more integrated user experience.
This commit is contained in:
@@ -1,8 +1,12 @@
|
|||||||
|
import 'package:auto_gpt_flutter_client/models/task.dart';
|
||||||
|
import 'package:auto_gpt_flutter_client/models/test_suite.dart';
|
||||||
|
import 'package:auto_gpt_flutter_client/viewmodels/api_settings_viewmodel.dart';
|
||||||
import 'package:auto_gpt_flutter_client/views/task/api_base_url_field.dart';
|
import 'package:auto_gpt_flutter_client/views/task/api_base_url_field.dart';
|
||||||
|
import 'package:auto_gpt_flutter_client/views/task/test_suite_detail_view.dart';
|
||||||
|
import 'package:auto_gpt_flutter_client/views/task/test_suite_list_tile.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:auto_gpt_flutter_client/viewmodels/task_viewmodel.dart';
|
import 'package:auto_gpt_flutter_client/viewmodels/task_viewmodel.dart';
|
||||||
import 'package:auto_gpt_flutter_client/viewmodels/chat_viewmodel.dart';
|
import 'package:auto_gpt_flutter_client/viewmodels/chat_viewmodel.dart';
|
||||||
import 'package:auto_gpt_flutter_client/viewmodels/api_settings_viewmodel.dart';
|
|
||||||
import 'package:auto_gpt_flutter_client/views/task/new_task_button.dart';
|
import 'package:auto_gpt_flutter_client/views/task/new_task_button.dart';
|
||||||
import 'package:auto_gpt_flutter_client/views/task/task_list_tile.dart';
|
import 'package:auto_gpt_flutter_client/views/task/task_list_tile.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
@@ -25,7 +29,7 @@ class _TaskViewState extends State<TaskView> {
|
|||||||
|
|
||||||
// Schedule the fetchTasks call for after the initial build
|
// Schedule the fetchTasks call for after the initial build
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
widget.viewModel.fetchTasks();
|
widget.viewModel.fetchAndCombineData();
|
||||||
_baseUrlController.text =
|
_baseUrlController.text =
|
||||||
Provider.of<ApiSettingsViewModel>(context, listen: false).baseURL;
|
Provider.of<ApiSettingsViewModel>(context, listen: false).baseURL;
|
||||||
});
|
});
|
||||||
@@ -33,9 +37,13 @@ class _TaskViewState extends State<TaskView> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
// Combine tasks and test suites into a single list
|
||||||
|
final items = widget.viewModel.combinedDataSource;
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: Colors.white,
|
backgroundColor: Colors.white,
|
||||||
body: Column(
|
body: Stack(
|
||||||
|
children: [
|
||||||
|
Column(
|
||||||
children: [
|
children: [
|
||||||
// Title and New Task button
|
// Title and New Task button
|
||||||
Padding(
|
Padding(
|
||||||
@@ -54,37 +62,57 @@ class _TaskViewState extends State<TaskView> {
|
|||||||
// Task List
|
// Task List
|
||||||
Expanded(
|
Expanded(
|
||||||
child: ListView.builder(
|
child: ListView.builder(
|
||||||
itemCount: widget.viewModel.tasks.length,
|
itemCount: items.length,
|
||||||
itemBuilder: (context, index) {
|
itemBuilder: (context, index) {
|
||||||
final task = widget.viewModel.tasks[index];
|
final item = items[index];
|
||||||
|
|
||||||
|
if (item is Task) {
|
||||||
return TaskListTile(
|
return TaskListTile(
|
||||||
task: task,
|
task: item,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// Select the task in TaskViewModel
|
// Select the task in TaskViewModel
|
||||||
widget.viewModel.selectTask(task.id);
|
widget.viewModel.selectTask(item.id);
|
||||||
|
|
||||||
// Update the current task ID in ChatViewModel
|
// Update the current task ID in ChatViewModel
|
||||||
// TODO: Do we want to have a reference to chat view model in this class?
|
// TODO: Do we want to have a reference to chat view model in this class?
|
||||||
final chatViewModel =
|
final chatViewModel = Provider.of<ChatViewModel>(
|
||||||
Provider.of<ChatViewModel>(context, listen: false);
|
context,
|
||||||
chatViewModel.setCurrentTaskId(task.id);
|
listen: false);
|
||||||
|
chatViewModel.setCurrentTaskId(item.id);
|
||||||
|
|
||||||
print('Task ${task.title} tapped');
|
print('Task ${item.title} tapped');
|
||||||
},
|
},
|
||||||
onDelete: () {
|
onDelete: () {
|
||||||
// Delete the task in TaskViewModel
|
// Delete the task in TaskViewModel
|
||||||
widget.viewModel.deleteTask(task.id);
|
widget.viewModel.deleteTask(item.id);
|
||||||
// TODO: Do we want to have a reference to chat view model in this class?
|
// TODO: Do we want to have a reference to chat view model in this class?
|
||||||
final chatViewModel =
|
final chatViewModel = Provider.of<ChatViewModel>(
|
||||||
Provider.of<ChatViewModel>(context, listen: false);
|
context,
|
||||||
if (chatViewModel.currentTaskId == task.id) {
|
listen: false);
|
||||||
|
if (chatViewModel.currentTaskId == item.id) {
|
||||||
chatViewModel.clearCurrentTaskAndChats();
|
chatViewModel.clearCurrentTaskAndChats();
|
||||||
}
|
}
|
||||||
|
|
||||||
print('Task ${task.title} delete button tapped');
|
print('Task ${item.title} delete button tapped');
|
||||||
},
|
},
|
||||||
selected: task.id == widget.viewModel.selectedTask?.id,
|
selected: item.id == widget.viewModel.selectedTask?.id,
|
||||||
);
|
);
|
||||||
|
} else if (item is TestSuite) {
|
||||||
|
return TestSuiteListTile(
|
||||||
|
testSuite: item,
|
||||||
|
onTap: () {
|
||||||
|
// Navigate to the new view for this test suite
|
||||||
|
widget.viewModel.deselectTask();
|
||||||
|
widget.viewModel.selectTestSuite(item);
|
||||||
|
// TODO: Do we want to have a reference to chat view model in this class?
|
||||||
|
Provider.of<ChatViewModel>(context, listen: false)
|
||||||
|
.clearCurrentTaskAndChats();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return const SizedBox
|
||||||
|
.shrink(); // return an empty widget if type is unknown
|
||||||
|
}
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -93,6 +121,19 @@ class _TaskViewState extends State<TaskView> {
|
|||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
if (widget.viewModel.selectedTestSuite != null)
|
||||||
|
Positioned(
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
child: TestSuiteDetailView(
|
||||||
|
testSuite: widget.viewModel.selectedTestSuite!,
|
||||||
|
viewModel: widget.viewModel,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user