Commit 62f383a1 authored by Tim Zallmann's avatar Tim Zallmann

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

CE backport of issue-boards-js-fix

See merge request gitlab-org/gitlab-ce!20840
parents 50352503 2f8b9931
/* eslint-disable quote-props, comma-dangle */
import $ from 'jquery'; import $ from 'jquery';
import _ from 'underscore'; import _ from 'underscore';
import Vue from 'vue'; import Vue from 'vue';
...@@ -47,7 +45,7 @@ export default () => { ...@@ -47,7 +45,7 @@ export default () => {
gl.IssueBoardsApp = new Vue({ gl.IssueBoardsApp = new Vue({
el: $boardApp, el: $boardApp,
components: { components: {
'board': gl.issueBoards.Board, board: gl.issueBoards.Board,
'board-sidebar': gl.issueBoards.BoardSidebar, 'board-sidebar': gl.issueBoards.BoardSidebar,
BoardAddIssuesModal, BoardAddIssuesModal,
}, },
...@@ -65,11 +63,11 @@ export default () => { ...@@ -65,11 +63,11 @@ export default () => {
defaultAvatar: $boardApp.dataset.defaultAvatar, defaultAvatar: $boardApp.dataset.defaultAvatar,
}, },
computed: { computed: {
detailIssueVisible () { detailIssueVisible() {
return Object.keys(this.detailIssue.issue).length; return Object.keys(this.detailIssue.issue).length;
}, },
}, },
created () { created() {
gl.boardService = new BoardService({ gl.boardService = new BoardService({
boardsEndpoint: this.boardsEndpoint, boardsEndpoint: this.boardsEndpoint,
listsEndpoint: this.listsEndpoint, listsEndpoint: this.listsEndpoint,
...@@ -89,15 +87,16 @@ export default () => { ...@@ -89,15 +87,16 @@ export default () => {
eventHub.$off('clearDetailIssue', this.clearDetailIssue); eventHub.$off('clearDetailIssue', this.clearDetailIssue);
sidebarEventHub.$off('toggleSubscription', this.toggleSubscription); sidebarEventHub.$off('toggleSubscription', this.toggleSubscription);
}, },
mounted () { mounted() {
this.filterManager = new FilteredSearchBoards(Store.filter, true, Store.cantEdit); this.filterManager = new FilteredSearchBoards(Store.filter, true, Store.cantEdit);
this.filterManager.setup(); this.filterManager.setup();
Store.disabled = this.disabled; Store.disabled = this.disabled;
gl.boardService.all() gl.boardService
.all()
.then(res => res.data) .then(res => res.data)
.then((data) => { .then(data => {
data.forEach((board) => { data.forEach(board => {
const list = Store.addList(board, this.defaultAvatar); const list = Store.addList(board, this.defaultAvatar);
if (list.type === 'closed') { if (list.type === 'closed') {
...@@ -126,7 +125,7 @@ export default () => { ...@@ -126,7 +125,7 @@ export default () => {
newIssue.setFetchingState('subscriptions', true); newIssue.setFetchingState('subscriptions', true);
BoardService.getIssueInfo(sidebarInfoEndpoint) BoardService.getIssueInfo(sidebarInfoEndpoint)
.then(res => res.data) .then(res => res.data)
.then((data) => { .then(data => {
newIssue.setFetchingState('subscriptions', false); newIssue.setFetchingState('subscriptions', false);
newIssue.updateData({ newIssue.updateData({
subscribed: data.subscribed, subscribed: data.subscribed,
...@@ -159,7 +158,7 @@ export default () => { ...@@ -159,7 +158,7 @@ export default () => {
Flash(__('An error occurred when toggling the notification subscription')); Flash(__('An error occurred when toggling the notification subscription'));
}); });
} }
} },
}, },
}); });
...@@ -168,77 +167,81 @@ export default () => { ...@@ -168,77 +167,81 @@ export default () => {
data: { data: {
filters: Store.state.filters, filters: Store.state.filters,
}, },
mounted () { mounted() {
gl.issueBoards.newListDropdownInit(); gl.issueBoards.newListDropdownInit();
}, },
}); });
gl.IssueBoardsModalAddBtn = new Vue({ const issueBoardsModal = document.getElementById('js-add-issues-btn');
el: document.getElementById('js-add-issues-btn'),
mixins: [modalMixin], if (issueBoardsModal) {
data() { gl.IssueBoardsModalAddBtn = new Vue({
return { el: issueBoardsModal,
modal: ModalStore.store, mixins: [modalMixin],
store: Store.state, data() {
canAdminList: this.$options.el.hasAttribute('data-can-admin-list'), return {
}; modal: ModalStore.store,
}, store: Store.state,
computed: { canAdminList: this.$options.el.hasAttribute('data-can-admin-list'),
disabled() { };
if (!this.store) {
return true;
}
return !this.store.lists.filter(list => !list.preset).length;
}, },
tooltipTitle() { computed: {
if (this.disabled) { disabled() {
return 'Please add a list to your board first'; if (!this.store) {
} return true;
}
return !this.store.lists.filter(list => !list.preset).length;
},
tooltipTitle() {
if (this.disabled) {
return 'Please add a list to your board first';
}
return ''; return '';
},
}, },
}, watch: {
watch: { disabled() {
disabled() { this.updateTooltip();
},
},
mounted() {
this.updateTooltip(); this.updateTooltip();
}, },
}, methods: {
mounted() { updateTooltip() {
this.updateTooltip(); const $tooltip = $(this.$refs.addIssuesButton);
},
methods: { this.$nextTick(() => {
updateTooltip() { if (this.disabled) {
const $tooltip = $(this.$refs.addIssuesButton); $tooltip.tooltip();
} else {
this.$nextTick(() => { $tooltip.tooltip('dispose');
if (this.disabled) { }
$tooltip.tooltip(); });
} else { },
$tooltip.tooltip('dispose'); openModal() {
if (!this.disabled) {
this.toggleModal(true);
} }
}); },
},
openModal() {
if (!this.disabled) {
this.toggleModal(true);
}
}, },
}, template: `
template: ` <div class="board-extra-actions">
<div class="board-extra-actions"> <button
<button class="btn btn-create prepend-left-10"
class="btn btn-create prepend-left-10" type="button"
type="button" data-placement="bottom"
data-placement="bottom" ref="addIssuesButton"
ref="addIssuesButton" :class="{ 'disabled': disabled }"
:class="{ 'disabled': disabled }" :title="tooltipTitle"
:title="tooltipTitle" :aria-disabled="disabled"
:aria-disabled="disabled" v-if="canAdminList"
v-if="canAdminList" @click="openModal">
@click="openModal"> Add issues
Add issues </button>
</button> </div>
</div> `,
`, });
}); }
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment