Merge branch 'issue-boards-js-fix' into 'master'

Fixed JS error in issue boards

See merge request gitlab-org/gitlab-ee!6660

app/assets/javascripts/boards/index.js

-/* eslint-disable quote-props, comma-dangle */
-
 import $ from 'jquery';
 import _ from 'underscore';
 import Vue from 'vue';
@@ -56,7 +54,7 @@ export default () => {
   gl.IssueBoardsApp = new Vue({
     el: $boardApp,
     components: {
-      'board': gl.issueBoards.Board,
+      board: gl.issueBoards.Board,
       'board-sidebar': gl.issueBoards.BoardSidebar,
       BoardAddIssuesModal,
     },
@@ -74,11 +72,11 @@ export default () => {
       defaultAvatar: $boardApp.dataset.defaultAvatar,
     },
     computed: {
-      detailIssueVisible () {
+      detailIssueVisible() {
         return Object.keys(this.detailIssue.issue).length;
       },
     },
-    created () {
+    created() {
       gl.boardService = new BoardService({
         boardsEndpoint: this.boardsEndpoint,
         listsEndpoint: this.listsEndpoint,
@@ -100,15 +98,16 @@ export default () => {
       sidebarEventHub.$off('toggleSubscription', this.toggleSubscription);
       sidebarEventHub.$off('updateWeight', this.updateWeight);
     },
-    mounted () {
+    mounted() {
       this.filterManager = new FilteredSearchBoards(Store.filter, true, Store.cantEdit);
       this.filterManager.setup();
 
       Store.disabled = this.disabled;
-      gl.boardService.all()
+      gl.boardService
+        .all()
         .then(res => res.data)
-        .then((data) => {
-          data.forEach((board) => {
+        .then(data => {
+          data.forEach(board => {
             const list = Store.addList(board, this.defaultAvatar);
 
             if (list.type === 'closed') {
@@ -140,7 +139,7 @@ export default () => {
           newIssue.setFetchingState('epic', true);
           BoardService.getIssueInfo(sidebarInfoEndpoint)
             .then(res => res.data)
-            .then((data) => {
+            .then(data => {
               newIssue.setFetchingState('subscriptions', false);
               newIssue.setFetchingState('weight', false);
               newIssue.setFetchingState('epic', false);
@@ -185,7 +184,7 @@ export default () => {
           issue.setLoadingState('weight', true);
           BoardService.updateWeight(issue.sidebarInfoEndpoint, newWeight)
             .then(res => res.data)
-            .then((data) => {
+            .then(data => {
               issue.setLoadingState('weight', false);
               issue.updateData({
                 weight: data.weight,
@@ -196,7 +195,7 @@ export default () => {
               Flash(__('An error occurred when updating the issue weight'));
             });
         }
-      }
+      },
     },
   });
 
@@ -206,7 +205,7 @@ export default () => {
       filters: Store.state.filters,
       milestoneTitle: $boardApp.dataset.boardMilestoneTitle,
     },
-    mounted () {
+    mounted() {
       gl.issueBoards.newListDropdownInit();
     },
   });
@@ -231,8 +230,8 @@ export default () => {
           return this.canAdminList ? 'Edit board' : 'View scope';
         },
         tooltipTitle() {
-          return this.hasScope ? __('This board\'s scope is reduced') : '';
-        }
+          return this.hasScope ? __("This board's scope is reduced") : '';
+        },
       },
       methods: {
         showPage: page => gl.issueBoards.BoardsStore.showPage(page),
@@ -254,8 +253,11 @@ export default () => {
     });
   }
 
+  const issueBoardsModal = document.getElementById('js-add-issues-btn');
+
+  if (issueBoardsModal) {
     gl.IssueBoardsModalAddBtn = new Vue({
-    el: document.getElementById('js-add-issues-btn'),
+      el: issueBoardsModal,
       mixins: [modalMixin],
       data() {
         return {
@@ -324,6 +326,7 @@ export default () => {
         </div>
       `,
     });
+  }
 
   gl.IssueBoardsToggleFocusBtn = new Vue({
     el: document.getElementById('js-toggle-focus-btn'),
@@ -335,7 +338,9 @@ export default () => {
     },
     methods: {
       toggleFocusMode() {
-        if (!this.focusModeAvailable) { return; }
+        if (!this.focusModeAvailable) {
+          return;
+        }
 
         $(this.$refs.toggleFocusModeButton).tooltip('hide');
         issueBoardsContent.classList.toggle('is-focused');
@@ -369,6 +374,6 @@ export default () => {
     el: '#js-multiple-boards-switcher',
     components: {
       'boards-selector': gl.issueBoards.BoardsSelector,
-    }
+    },
   });
 };

locale/gitlab.pot

@@ -6227,7 +6227,7 @@ msgstr ""
 msgid "This application will be able to:"
 msgstr ""
 
-msgid "This board\\'s scope is reduced"
+msgid "This board's scope is reduced"
 msgstr ""
 
 msgid "This diff is collapsed."