Merge branch 'add-issues-button-disable' into 'master'

Disables add issue button

Closes #27931

See merge request !9100

2 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6
index 0df72023107..b05d01e178a 100644
--- a/app/assets/javascripts/boards/boards_bundle.js.es6
+++ b/app/assets/javascripts/boards/boards_bundle.js.es6
@@ -103,7 +103,7 @@ $(() => {
     },
     computed: {
       disabled() {
-        return Store.shouldAddBlankState();
+        return !this.store.lists.filter(list => list.type !== 'blank' && list.type !== 'done').length;
       },
     },
     template: `
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 4b6e69ef8ec..c7d5cedfe7b 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -27,6 +27,12 @@ describe 'Issue Boards', feature: true, js: true do
       expect(page).to have_content('Welcome to your Issue Board!')
     end
 
+    it 'disables add issues button by default' do
+      button = page.find('.issue-boards-search button', text: 'Add issues')
+
+      expect(button[:disabled]).to eq true
+    end
+
     it 'hides the blank state when clicking nevermind button' do
       page.within(find('.board-blank-state')) do
         click_button("Nevermind, I'll use my own")