diff --git a/apps/web/core/components/issues/issue-layouts/list/list-group.tsx b/apps/web/core/components/issues/issue-layouts/list/list-group.tsx index e5f567d35..073eec27c 100644 --- a/apps/web/core/components/issues/issue-layouts/list/list-group.tsx +++ b/apps/web/core/components/issues/issue-layouts/list/list-group.tsx @@ -240,7 +240,7 @@ export const ListGroup = observer((props: Props) => { isWorkflowDropDisabled, ]); - const isDragAllowed = !!group_by && DRAG_ALLOWED_GROUPS.includes(group_by); + const isDragAllowed = group_by ? DRAG_ALLOWED_GROUPS.includes(group_by) : true; const canOverlayBeVisible = isWorkflowDropDisabled || orderBy !== "sort_order" || !!group.isDropDisabled; const isDropDisabled = isWorkflowDropDisabled || !!group.isDropDisabled; diff --git a/apps/web/core/components/issues/issue-layouts/utils.tsx b/apps/web/core/components/issues/issue-layouts/utils.tsx index 7afc931e4..c63ce1b0f 100644 --- a/apps/web/core/components/issues/issue-layouts/utils.tsx +++ b/apps/web/core/components/issues/issue-layouts/utils.tsx @@ -521,7 +521,7 @@ export const handleGroupDragDrop = async ( subGroupBy: TIssueGroupByOptions | undefined, shouldAddIssueAtTop = false ) => { - if (!source.id || !groupBy || (subGroupBy && (!source.subGroupId || !destination.subGroupId))) return; + if (!source.id || (subGroupBy && (!source.subGroupId || !destination.subGroupId))) return; let updatedIssue: Partial = {}; const issueUpdates: IssueUpdates = {}; @@ -549,7 +549,7 @@ export const handleGroupDragDrop = async ( }; // update updatedIssue values based on the source and destination groupIds - if (source.groupId && destination.groupId && source.groupId !== destination.groupId) { + if (source.groupId && destination.groupId && source.groupId !== destination.groupId && groupBy) { const groupKey = ISSUE_FILTER_DEFAULT_DATA[groupBy]; let groupValue: any = clone(sourceIssue[groupKey]);