diff --git a/backend/plugins/operation_api/src/modules/task/@types/task.ts b/backend/plugins/operation_api/src/modules/task/@types/task.ts
index fe9bad1849..43dfe2330f 100644
--- a/backend/plugins/operation_api/src/modules/task/@types/task.ts
+++ b/backend/plugins/operation_api/src/modules/task/@types/task.ts
@@ -15,7 +15,7 @@ export interface ITask {
assigneeId?: string;
createdBy?: string;
cycleId?: string | null;
- projectId?: string;
+ projectId?: string | null;
estimatePoint?: number;
userId?: string;
startDate?: Date;
diff --git a/backend/plugins/operation_api/src/modules/task/db/models/Task.ts b/backend/plugins/operation_api/src/modules/task/db/models/Task.ts
index 1b2d5d974e..933d57f39d 100644
--- a/backend/plugins/operation_api/src/modules/task/db/models/Task.ts
+++ b/backend/plugins/operation_api/src/modules/task/db/models/Task.ts
@@ -84,7 +84,7 @@ export const loadTaskClass = (models: IModels) => {
if (params.projectId) {
query.projectId = params.projectId;
}
-
+
if (params.createdAt) {
query.createdAt = { $gte: params.createdAt };
}
@@ -161,6 +161,8 @@ export const loadTaskClass = (models: IModels) => {
}) {
const { _id, ...rest } = doc;
+ if (rest.projectId === '') rest.projectId = null;
+
const task = await models.Task.findOne({ _id });
if (!task) {
@@ -216,7 +218,7 @@ export const loadTaskClass = (models: IModels) => {
rest.number = nextNumber;
rest.status = newStatus?._id;
- rest.cycleId = '';
+ rest.cycleId = null;
}
await createActivity({
diff --git a/frontend/plugins/operation_ui/src/modules/project/hooks/useGetProjects.tsx b/frontend/plugins/operation_ui/src/modules/project/hooks/useGetProjects.tsx
index 97c7a10dd3..8af95acd2c 100644
--- a/frontend/plugins/operation_ui/src/modules/project/hooks/useGetProjects.tsx
+++ b/frontend/plugins/operation_ui/src/modules/project/hooks/useGetProjects.tsx
@@ -36,13 +36,11 @@ export const useProjectsVariables = (
const { cursor } = useRecordTableCursor({
sessionKey: PROJECTS_CURSOR_SESSION_KEY,
});
- const [{ name, team, priority, status, lead }] = useMultiQueryState<{
+ const [{ name, team, lead }] = useMultiQueryState<{
name: string;
team: string;
- priority: string;
- status: string;
lead: string;
- }>(['name', 'team', 'priority', 'status', 'lead']);
+ }>(['name', 'team', 'lead']);
const currentUser = useAtomValue(currentUserState);
return {
@@ -52,9 +50,6 @@ export const useProjectsVariables = (
},
cursor,
name: name || undefined,
-
- priority: priority || undefined,
- status: status || undefined,
leadId: lead || undefined,
...variables,
...(variables?.teamIds || variables?.userId || !currentUser?._id
diff --git a/frontend/plugins/operation_ui/src/modules/task/components/TaskDetailSheet.tsx b/frontend/plugins/operation_ui/src/modules/task/components/TaskDetailSheet.tsx
index 407ec89a3e..59b57a7bc3 100644
--- a/frontend/plugins/operation_ui/src/modules/task/components/TaskDetailSheet.tsx
+++ b/frontend/plugins/operation_ui/src/modules/task/components/TaskDetailSheet.tsx
@@ -50,8 +50,6 @@ export const TaskDetailSheetHeader = () => {