Merge branch 'Update-boards/models/list.js-to-use-boardsStore' into 'master'

Remove all references of BoardService in the list.js file

See merge request gitlab-org/gitlab!20145

app/assets/javascripts/boards/models/list.js

@@ -93,7 +93,7 @@ class List {
       entityType = 'milestone_id';
     }
 
-    return gl.boardService
+    return boardsStore
       .createList(entity.id, entityType)
       .then(res => res.data)
       .then(data => {
@@ -111,14 +111,14 @@ class List {
     boardsStore.state.lists.splice(index, 1);
     boardsStore.updateNewListDropdown(this.id);
 
-    gl.boardService.destroyList(this.id).catch(() => {
+    boardsStore.destroyList(this.id).catch(() => {
       // TODO: handle request error
     });
   }
 
   update() {
     const collapsed = !this.isExpanded;
-    return gl.boardService.updateList(this.id, this.position, collapsed).catch(() => {
+    return boardsStore.updateList(this.id, this.position, collapsed).catch(() => {
       // TODO: handle request error
     });
   }
@@ -147,7 +147,7 @@ class List {
       this.loading = true;
     }
 
-    return gl.boardService
+    return boardsStore
       .getIssuesForList(this.id, data)
       .then(res => res.data)
       .then(data => {
@@ -168,7 +168,7 @@ class List {
     this.addIssue(issue, null, 0);
     this.issuesSize += 1;
 
-    return gl.boardService
+    return boardsStore
       .newIssue(this.id, issue)
       .then(res => res.data)
       .then(data => this.onNewIssueResponse(issue, data));
@@ -276,7 +276,7 @@ class List {
     this.issues.splice(oldIndex, 1);
     this.issues.splice(newIndex, 0, issue);
 
-    gl.boardService.moveIssue(issue.id, null, null, moveBeforeId, moveAfterId).catch(() => {
+    boardsStore.moveIssue(issue.id, null, null, moveBeforeId, moveAfterId).catch(() => {
       // TODO: handle request error
     });
   }
@@ -287,7 +287,7 @@ class List {
     });
     this.issues.splice(newIndex, 0, ...issues);
 
-    gl.boardService
+    boardsStore
       .moveMultipleIssues({
         ids: issues.map(issue => issue.id),
         fromListId: null,
@@ -299,15 +299,13 @@ class List {
   }
 
   updateIssueLabel(issue, listFrom, moveBeforeId, moveAfterId) {
-    gl.boardService
-      .moveIssue(issue.id, listFrom.id, this.id, moveBeforeId, moveAfterId)
-      .catch(() => {
-        // TODO: handle request error
-      });
+    boardsStore.moveIssue(issue.id, listFrom.id, this.id, moveBeforeId, moveAfterId).catch(() => {
+      // TODO: handle request error
+    });
   }
 
   updateMultipleIssues(issues, listFrom, moveBeforeId, moveAfterId) {
-    gl.boardService
+    boardsStore
       .moveMultipleIssues({
         ids: issues.map(issue => issue.id),
         fromListId: listFrom.id,
@@ -359,7 +357,7 @@ class List {
 
     if (this.issuesSize > 1) {
       const moveBeforeId = this.issues[1].id;
-      gl.boardService.moveIssue(issue.id, null, null, null, moveBeforeId);
+      boardsStore.moveIssue(issue.id, null, null, null, moveBeforeId);
     }
   }
 }

changelogs/unreleased/Update-boards-models-list-js-to-use-boardsStore.yml

+---
+title: Removes references of BoardService in list file
+merge_request: 20145
+author: nuwe1
+type: other

spec/javascripts/boards/boards_store_spec.js

@@ -11,7 +11,7 @@ import '~/boards/models/list';
 import '~/boards/services/board_service';
 import boardsStore from '~/boards/stores/boards_store';
 import eventHub from '~/boards/eventhub';
-import { listObj, listObjDuplicate, boardsMockInterceptor, mockBoardService } from './mock_data';
+import { listObj, listObjDuplicate, boardsMockInterceptor } from './mock_data';
 import waitForPromises from '../../frontend/helpers/wait_for_promises';
 
 describe('Store', () => {
@@ -20,17 +20,16 @@ describe('Store', () => {
   beforeEach(() => {
     mock = new MockAdapter(axios);
     mock.onAny().reply(boardsMockInterceptor);
-    gl.boardService = mockBoardService();
     boardsStore.create();
 
-    spyOn(gl.boardService, 'moveIssue').and.callFake(
+    spyOn(boardsStore, 'moveIssue').and.callFake(
       () =>
         new Promise(resolve => {
           resolve();
         }),
     );
 
-    spyOn(gl.boardService, 'moveMultipleIssues').and.callFake(
+    spyOn(boardsStore, 'moveMultipleIssues').and.callFake(
       () =>
         new Promise(resolve => {
           resolve();
@@ -263,7 +262,7 @@ describe('Store', () => {
         expect(listOne.issues.length).toBe(0);
         expect(listTwo.issues.length).toBe(2);
         expect(listTwo.issues[0].id).toBe(2);
-        expect(gl.boardService.moveIssue).toHaveBeenCalledWith(2, listOne.id, listTwo.id, null, 1);
+        expect(boardsStore.moveIssue).toHaveBeenCalledWith(2, listOne.id, listTwo.id, null, 1);
 
         done();
       }, 0);
@@ -286,7 +285,7 @@ describe('Store', () => {
         expect(listOne.issues.length).toBe(0);
         expect(listTwo.issues.length).toBe(2);
         expect(listTwo.issues[1].id).toBe(2);
-        expect(gl.boardService.moveIssue).toHaveBeenCalledWith(2, listOne.id, listTwo.id, 1, null);
+        expect(boardsStore.moveIssue).toHaveBeenCalledWith(2, listOne.id, listTwo.id, 1, null);
 
         done();
       }, 0);
@@ -311,7 +310,7 @@ describe('Store', () => {
         boardsStore.moveIssueInList(list, issue, 0, 1, [1, 2]);
 
         expect(list.issues[0].id).toBe(2);
-        expect(gl.boardService.moveIssue).toHaveBeenCalledWith(2, null, null, 1, null);
+        expect(boardsStore.moveIssue).toHaveBeenCalledWith(2, null, null, 1, null);
 
         done();
       });
@@ -495,7 +494,7 @@ describe('Store', () => {
 
           expect(list.issues[0].id).toBe(issue1.id);
 
-          expect(gl.boardService.moveMultipleIssues).toHaveBeenCalledWith({
+          expect(boardsStore.moveMultipleIssues).toHaveBeenCalledWith({
             ids: [issue1.id, issue2.id],
             fromListId: null,
             toListId: null,

spec/javascripts/boards/list_spec.js

@@ -12,7 +12,7 @@ import '~/boards/models/issue';
 import '~/boards/models/list';
 import '~/boards/services/board_service';
 import boardsStore from '~/boards/stores/boards_store';
-import { listObj, listObjDuplicate, boardsMockInterceptor, mockBoardService } from './mock_data';
+import { listObj, listObjDuplicate, boardsMockInterceptor } from './mock_data';
 
 describe('List model', () => {
   let list;
@@ -21,9 +21,6 @@ describe('List model', () => {
   beforeEach(() => {
     mock = new MockAdapter(axios);
     mock.onAny().reply(boardsMockInterceptor);
-    gl.boardService = mockBoardService({
-      bulkUpdatePath: '/test/issue-boards/board/1/lists',
-    });
     boardsStore.create();
 
     list = new List(listObj);
@@ -110,11 +107,11 @@ describe('List model', () => {
     list.issues.push(issue);
     listDup.issues.push(issue);
 
-    spyOn(gl.boardService, 'moveIssue').and.callThrough();
+    spyOn(boardsStore, 'moveIssue').and.callThrough();
 
     listDup.updateIssueLabel(issue, list);
 
-    expect(gl.boardService.moveIssue).toHaveBeenCalledWith(
+    expect(boardsStore.moveIssue).toHaveBeenCalledWith(
       issue.id,
       list.id,
       listDup.id,
@@ -172,7 +169,7 @@ describe('List model', () => {
 
   describe('newIssue', () => {
     beforeEach(() => {
-      spyOn(gl.boardService, 'newIssue').and.returnValue(
+      spyOn(boardsStore, 'newIssue').and.returnValue(
         Promise.resolve({
           data: {
             id: 42,