Commit 291770e0 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch '293960-no-boards-found-message-showing-when-loading-boards' into 'master'

Resolve ""No boards found" message showing when loading boards"

See merge request gitlab-org/gitlab!50140
parents b664c73c 5794bfc0
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
return this.groupId ? 'group' : 'project'; return this.groupId ? 'group' : 'project';
}, },
loading() { loading() {
return this.loadingRecentBoards && this.loadingBoards; return this.loadingRecentBoards || Boolean(this.loadingBoards);
}, },
currentPage() { currentPage() {
return this.state.currentPage; return this.state.currentPage;
......
---
title: Resolve No boards found message showing when loading boards
merge_request: 50140
author:
type: fixed
...@@ -126,7 +126,10 @@ describe('BoardsSelector', () => { ...@@ -126,7 +126,10 @@ describe('BoardsSelector', () => {
}); });
describe('loaded', () => { describe('loaded', () => {
beforeEach(() => { beforeEach(async () => {
await wrapper.setData({
loadingBoards: false,
});
return Promise.all([allBoardsResponse, recentBoardsResponse]).then(() => nextTick()); return Promise.all([allBoardsResponse, recentBoardsResponse]).then(() => nextTick());
}); });
......
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