ami/tl-vikunja
1
0
Fork 0
Code

fix(kanban): correctly paginate filtered kanban buckets

Browse Source 
Resolves https://github.com/go-vikunja/vikunja/issues/314

(cherry picked from commit 1451f6e46f03c30384834ff99e0cbe7f15958536)
This commit is contained in:
kolaente 2024-09-14 09:37:11 +02:00
parent 89d643b9cf
commit 971f328256
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/stores/kanban.ts
View File

@ -266,15 +266,6 @@ export const useKanbanStore = defineStore('kanban', () => {
} }
} }
function getPaginatedTaskResult(result: IBucket[], bucketId: IBucket['id']): ITask[] {
const bucket = result.find(b => b.id === bucketId)
if (!bucket) {
return []
}
return bucket.tasks
}
async function loadNextTasksForBucket( async function loadNextTasksForBucket(
projectId: IProject['id'], projectId: IProject['id'],
viewId: IProjectView['id'], viewId: IProjectView['id'],
@ -306,8 +297,7 @@ export const useKanbanStore = defineStore('kanban', () => {
const taskService = new TaskCollectionService() const taskService = new TaskCollectionService()
try { try {
const result = await taskService.getAll({projectId, viewId}, params, page) const tasks = await taskService.getAll({projectId, viewId}, params, page)
const tasks = getPaginatedTaskResult(result as unknown as IBucket[], bucketId)
addTasksToBucket(tasks, bucketId) addTasksToBucket(tasks, bucketId)
setTasksLoadedForBucketPage({bucketId, page}) setTasksLoadedForBucketPage({bucketId, page})
if (taskService.totalPages <= page) { if (taskService.totalPages <= page) {

12
pkg/models/task_collection.go
View File

@ -137,7 +137,11 @@ func getTaskFilterOptsFromCollection(tf *TaskCollection, projectView *ProjectVie
return opts, err return opts, err
} }
func getTaskOrTasksInBuckets(s *xorm.Session, a web.Auth, projects []*Project, view *ProjectView, opts *taskSearchOptions) (tasks interface{}, resultCount int, totalItems int64, err error) { func getTaskOrTasksInBuckets(s *xorm.Session, a web.Auth, projects []*Project, view *ProjectView, opts *taskSearchOptions, filteringForBucket bool) (tasks interface{}, resultCount int, totalItems int64, err error) {
if filteringForBucket {
return getTasksForProjects(s, projects, a, opts, view)
}
if view != nil && !strings.Contains(opts.filter, "bucket_id") { if view != nil && !strings.Contains(opts.filter, "bucket_id") {
if view.BucketConfigurationMode != BucketConfigurationModeNone { if view.BucketConfigurationMode != BucketConfigurationModeNone {
tasksInBuckets, err := GetTasksInBucketsForView(s, view, projects, opts, a) tasksInBuckets, err := GetTasksInBucketsForView(s, view, projects, opts, a)
@ -262,6 +266,7 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
} }
var view *ProjectView var view *ProjectView
var filteringForBucket bool
if tf.ProjectViewID != 0 { if tf.ProjectViewID != 0 {
view, err = GetProjectViewByIDAndProject(s, tf.ProjectViewID, tf.ProjectID) view, err = GetProjectViewByIDAndProject(s, tf.ProjectViewID, tf.ProjectID)
if err != nil { if err != nil {
@ -277,6 +282,7 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
} }
if view.BucketConfigurationMode == BucketConfigurationModeFilter && strings.Contains(tf.Filter, "bucket_id") { if view.BucketConfigurationMode == BucketConfigurationModeFilter && strings.Contains(tf.Filter, "bucket_id") {
filteringForBucket = true
tf.Filter, err = getFilterValueForBucketFilter(tf.Filter, view) tf.Filter, err = getFilterValueForBucketFilter(tf.Filter, view)
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err
@ -318,7 +324,7 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err
} }
return getTaskOrTasksInBuckets(s, a, []*Project{project}, view, opts) return getTaskOrTasksInBuckets(s, a, []*Project{project}, view, opts, filteringForBucket)
} }
projects, err := getRelevantProjectsFromCollection(s, a, tf) projects, err := getRelevantProjectsFromCollection(s, a, tf)
@ -326,5 +332,5 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
return nil, 0, 0, err return nil, 0, 0, err
} }
return getTaskOrTasksInBuckets(s, a, projects, view, opts) return getTaskOrTasksInBuckets(s, a, projects, view, opts, filteringForBucket)
} }