ami/tl-vikunja
1
0
Fork 0
Code

fix(kanban): remove leftovers of kanban_position property

Browse Source 
This might fix a bug where the kanban position would not be saved correctly.
This commit is contained in:
kolaente 2024-06-06 16:22:51 +02:00
parent e7041f02d0
commit 0c411fd1e9
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/project/views/ProjectKanban.vue
View File

@ -486,8 +486,8 @@ async function updateTaskPosition(e) {
const newTask = klona(task) // cloning the task to avoid pinia store manipulation const newTask = klona(task) // cloning the task to avoid pinia store manipulation
newTask.bucketId = newBucket.id newTask.bucketId = newBucket.id
const position = calculateItemPosition( const position = calculateItemPosition(
taskBefore !== null ? taskBefore.kanbanPosition : null, taskBefore !== null ? taskBefore.position : null,
taskAfter !== null ? taskAfter.kanbanPosition : null, taskAfter !== null ? taskAfter.position : null,
) )
if ( if (
oldBucket !== undefined && // This shouldn't actually be `undefined`, but let's play it safe. oldBucket !== undefined && // This shouldn't actually be `undefined`, but let's play it safe.
@ -525,13 +525,13 @@ async function updateTaskPosition(e) {
} }
// Make sure the first and second task don't both get position 0 assigned // Make sure the first and second task don't both get position 0 assigned
if (newTaskIndex === 0 && taskAfter !== null && taskAfter.kanbanPosition === 0) { if (newTaskIndex === 0 && taskAfter !== null && taskAfter.position === 0) {
const taskAfterAfter = newBucket.tasks[newTaskIndex + 2] ?? null const taskAfterAfter = newBucket.tasks[newTaskIndex + 2] ?? null
const newTaskAfter = klona(taskAfter) // cloning the task to avoid pinia store manipulation const newTaskAfter = klona(taskAfter) // cloning the task to avoid pinia store manipulation
newTaskAfter.bucketId = newBucket.id newTaskAfter.bucketId = newBucket.id
newTaskAfter.kanbanPosition = calculateItemPosition( newTaskAfter.position = calculateItemPosition(
0, 0,
taskAfterAfter !== null ? taskAfterAfter.kanbanPosition : null, taskAfterAfter !== null ? taskAfterAfter.position : null,
) )
await taskStore.update(newTaskAfter) await taskStore.update(newTaskAfter)

1
frontend/src/modelTypes/ITask.ts
View File

@ -45,7 +45,6 @@ export interface ITask extends IAbstract {
subscription: ISubscription subscription: ISubscription
position: number position: number
kanbanPosition: number
reactions: IReactionPerEntity reactions: IReactionPerEntity

1
frontend/src/models/task.ts
View File

@ -85,7 +85,6 @@ export default class TaskModel extends AbstractModel<ITask> implements ITask {
subscription: ISubscription = null subscription: ISubscription = null
position = 0 position = 0
kanbanPosition = 0
reactions = {} reactions = {}

2
frontend/src/services/taskCollection.ts
View File

@ -5,7 +5,7 @@ import type {ITask} from '@/modelTypes/ITask'
import BucketModel from '@/models/bucket' import BucketModel from '@/models/bucket'
export interface TaskFilterParams { export interface TaskFilterParams {
sort_by: ('start_date' | 'end_date' | 'due_date' | 'done' | 'id' | 'position' | 'kanban_position')[], sort_by: ('start_date' | 'end_date' | 'due_date' | 'done' | 'id' | 'position')[],
order_by: ('asc' | 'desc')[], order_by: ('asc' | 'desc')[],
filter: string, filter: string,
filter_include_nulls: boolean, filter_include_nulls: boolean,