1 files changed, 22 insertions, 14 deletions

diff --git a/app/assets/javascripts/boards/boards_util.js b/app/assets/javascripts/boards/boards_util.js
index 6b7b0c2e28d..0142c95e773 100644
--- a/app/assets/javascripts/boards/boards_util.js
+++ b/app/assets/javascripts/boards/boards_util.js
@@ -1,5 +1,4 @@
 import { sortBy } from 'lodash';
-import ListIssue from 'ee_else_ce/boards/models/issue';
 import { ListType } from './constants';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import boardsStore from '~/boards/stores/boards_store';
@@ -21,11 +20,11 @@ export function formatBoardLists(lists) {
 }
 
 export function formatIssue(issue) {
-  return new ListIssue({
+  return {
     ...issue,
     labels: issue.labels?.nodes || [],
     assignees: issue.assignees?.nodes || [],
-  });
+  };
 }
 
 export function formatListIssues(listIssues) {
@@ -44,12 +43,12 @@ export function formatListIssues(listIssues) {
       [list.id]: sortedIssues.map(i => {
         const id = getIdFromGraphQLId(i.id);
 
-        const listIssue = new ListIssue({
+        const listIssue = {
           ...i,
           id,
           labels: i.labels?.nodes || [],
           assignees: i.assignees?.nodes || [],
-        });
+        };
 
         issues[id] = listIssue;
 
@@ -83,21 +82,30 @@ export function fullLabelId(label) {
 }
 
 export function moveIssueListHelper(issue, fromList, toList) {
-  if (toList.type === ListType.label) {
-    issue.addLabel(toList.label);
+  const updatedIssue = issue;
+  if (
+    toList.type === ListType.label &&
+    !updatedIssue.labels.find(label => label.id === toList.label.id)
+  ) {
+    updatedIssue.labels.push(toList.label);
   }
-  if (fromList && fromList.type === ListType.label) {
-    issue.removeLabel(fromList.label);
+  if (fromList?.label && fromList.type === ListType.label) {
+    updatedIssue.labels = updatedIssue.labels.filter(label => fromList.label.id !== label.id);
   }
 
-  if (toList.type === ListType.assignee) {
-    issue.addAssignee(toList.assignee);
+  if (
+    toList.type === ListType.assignee &&
+    !updatedIssue.assignees.find(assignee => assignee.id === toList.assignee.id)
+  ) {
+    updatedIssue.assignees.push(toList.assignee);
   }
-  if (fromList && fromList.type === ListType.assignee) {
-    issue.removeAssignee(fromList.assignee);
+  if (fromList?.assignee && fromList.type === ListType.assignee) {
+    updatedIssue.assignees = updatedIssue.assignees.filter(
+      assignee => assignee.id !== fromList.assignee.id,
+    );
   }
 
-  return issue;
+  return updatedIssue;
 }
 
 export default {