Skip to content

TaskView is a self-hosted project and task management platform focused on clarity, ownership, and control. TaskView is built for teams that want a transparent, self-hosted alternative to SaaS task managers.

fix: fix issues

Nikolai Giman471a82b9f57e
diff --git a/api/src/tv-modules/tasks/TasksRepository.ts b/api/src/tv-modules/tasks/TasksRepository.ts
index e2169bb..6bef241 100644
--- a/api/src/tv-modules/tasks/TasksRepository.ts
+++ b/api/src/tv-modules/tasks/TasksRepository.ts
@@ -274,7 +274,7 @@ export class TasksRepository {
async fetchSubtasks(taskId: number): Promise<TasksSchemaTypeForSelect[]> {
const result = await callWithCatch(() =>
- this.db.dbDrizzle.select().from(TasksSchema).where(eq(TasksSchema.parentId, taskId))
+ this.db.dbDrizzle.select().from(TasksSchema).where(eq(TasksSchema.parentId, taskId)).orderBy(asc(TasksSchema.id))
);
return result ?? [];
@@ -560,8 +560,10 @@ export class TasksRepository {
}
// complete
- if (data.showCompleted === 0) conditions.push(eq(TasksSchema.complete, false));
- else if (data.showCompleted === 1) conditions.push(eq(TasksSchema.complete, true));
+ if (!data.ignoreCompleted) {
+ if (data.showCompleted === 0) conditions.push(eq(TasksSchema.complete, false));
+ else if (data.showCompleted === 1) conditions.push(eq(TasksSchema.complete, true));
+ }
// assignee filter — через EXISTS
if (data.filters?.selectedUser) {
diff --git a/api/src/tv-modules/tasks/tasks.server.types.ts b/api/src/tv-modules/tasks/tasks.server.types.ts
index fa42c8a..6f2eaac 100644
--- a/api/src/tv-modules/tasks/tasks.server.types.ts
+++ b/api/src/tv-modules/tasks/tasks.server.types.ts
@@ -12,7 +12,7 @@ export const TaskArkTypeUpdate = type({
'parentId?': 'number|null',
'description?': 'string',
'complete?': 'boolean',
- 'goalListId?': 'number',
+ 'goalListId?': 'number|null',
// 'creatorId?': 'number',
'note?': 'string',
'priorityId?': '1|2|3|null',
@@ -64,6 +64,7 @@ export const TaskArkTypeFetchTasksNew = type({
})
.pipe(TaskArkTypeFetchTasksNewFilters),
'unlimited?': type('string').pipe((v) => v === 'true'),
+ 'ignoreCompleted?': type('string').pipe((v) => v === 'true'),
});
export type TaskArgFetchTasksNew = typeof TaskArkTypeFetchTasksNew.infer;
diff --git a/taskview-packages/taskview-api/src/api/tasks.api.types.ts b/taskview-packages/taskview-api/src/api/tasks.api.types.ts
index 89fa08f..bbe3ef8 100644
--- a/taskview-packages/taskview-api/src/api/tasks.api.types.ts
+++ b/taskview-packages/taskview-api/src/api/tasks.api.types.ts
@@ -77,6 +77,7 @@ export type TaskArgFetch = {
searchText?: string;
filters?: TaskFilters;
unlimited?: boolean;
+ ignoreCompleted?: boolean;
};
export type TaskResponseFetch = Task[];