From c3b00ae5f8e2982bd8d1a347ae27d76ad6061b97 Mon Sep 17 00:00:00 2001 From: Mahdi Date: Thu, 19 Nov 2026 22:03:55 +0330 Subject: [PATCH] Remove completed personal shares from the assignee desk view. Co-authored-by: Cursor --- apps/web/src/components/activities/ActivityQuickView.vue | 2 +- apps/web/src/views/ActivitiesView.vue | 5 +++-- apps/web/src/views/ActivityDetailView.vue | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/web/src/components/activities/ActivityQuickView.vue b/apps/web/src/components/activities/ActivityQuickView.vue index faa524a..9f82ae5 100644 --- a/apps/web/src/components/activities/ActivityQuickView.vue +++ b/apps/web/src/components/activities/ActivityQuickView.vue @@ -444,7 +444,7 @@ async function runAction() { const { data } = await api.patch(`/activities/${id}/complete`, undefined, { params: undo ? { undo: '1' } : undefined, }); - if (data.status === 'done') { + if (data.status === 'done' || (!undo && data.completionMode === 'all')) { emit('changed'); emit('close'); return; diff --git a/apps/web/src/views/ActivitiesView.vue b/apps/web/src/views/ActivitiesView.vue index 67f8af9..f9a6bd8 100644 --- a/apps/web/src/views/ActivitiesView.vue +++ b/apps/web/src/views/ActivitiesView.vue @@ -336,7 +336,8 @@ const sharedParams = computed>(() => ({ boardId: board.value || undefined, filter: filter.value, q: typeof route.query.q === 'string' && route.query.q.trim() ? route.query.q.trim() : undefined, - desk: showDeskTabs.value ? desk.value : undefined, + // همیشه desk بفرست تا سهمِ انجام‌شده از میز «من» حذف شود (حتی بدون تب تیم/من) + desk: desk.value, typeDefId: typeof route.query.typeDefId === 'string' && route.query.typeDefId.trim() ? route.query.typeDefId.trim() : undefined, @@ -456,7 +457,7 @@ function deskDetailQuery(columnStageId?: string): Record { filter: filter.value, }; if (board.value) query.board = board.value; - if (showDeskTabs.value) query.desk = desk.value; + query.desk = desk.value; const search = typeof route.query.q === 'string' ? route.query.q.trim() : ''; if (search) query.q = search; if (typeFilter.value !== 'all') query.typeDefId = typeFilter.value; diff --git a/apps/web/src/views/ActivityDetailView.vue b/apps/web/src/views/ActivityDetailView.vue index f76ed54..71198dd 100644 --- a/apps/web/src/views/ActivityDetailView.vue +++ b/apps/web/src/views/ActivityDetailView.vue @@ -842,7 +842,8 @@ function moveToStage(stageId: string) { message.info( 'سهم شما ثبت شد. فعالیت وقتی انجام‌شده می‌شود که همهٔ مسئول‌ها سهم خود را بزنند.', ); - await load(); + discardDrafts(); + await advanceAfterLeavingColumn(leftId); return; } discardDrafts(); @@ -938,6 +939,12 @@ async function complete(kind: 'share' | 'force' | 'undo' = 'share') { await advanceAfterLeavingColumn(leftId); return; } + // سهم شخصی ثبت شد ولی فعالیت هنوز باز است — از میزکار این نفر خارج شو + if (kind === 'share' && data.completionMode === 'all') { + discardDrafts(); + await advanceAfterLeavingColumn(leftId); + return; + } activity.value = data; } catch { error.value =