Merge branch 'fix-unassigned-checkmark' into 'master'

Fix unassigned checkmark

Closes #31843

See merge request !11391

4 files changed, 34 insertions, 7 deletions

diff --git a/app/assets/javascripts/boards/components/board_sidebar.js b/app/assets/javascripts/boards/components/board_sidebar.js
index 082025eabaa..9e2102eb077 100644
--- a/app/assets/javascripts/boards/components/board_sidebar.js
+++ b/app/assets/javascripts/boards/components/board_sidebar.js
@@ -45,6 +45,12 @@ gl.issueBoards.BoardSidebar = Vue.extend({
     detail: {
       handler () {
         if (this.issue.id !== this.detail.issue.id) {
+          $('.block.assignee')
+            .find('input:not(.js-vue)[name="issue[assignee_ids][]"]')
+            .each((i, el) => {
+              $(el).remove();
+            });
+
           $('.js-issue-board-sidebar', this.$el).each((i, el) => {
             $(el).data('glDropdown').clearMenu();
           });
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js
index 8119a8cd000..1724ca86b61 100644
--- a/app/assets/javascripts/users_select.js
+++ b/app/assets/javascripts/users_select.js
@@ -50,7 +50,11 @@ function UsersSelect(currentUser, els) {
       $collapsedSidebar = $block.find('.sidebar-collapsed-user');
       $loading = $block.find('.block-loading').fadeOut();
       selectedIdDefault = (defaultNullUser && showNullUser) ? 0 : null;
-      selectedId = $dropdown.data('selected') || selectedIdDefault;
+      selectedId = $dropdown.data('selected');
+
+      if (selectedId === undefined) {
+        selectedId = selectedIdDefault;
+      }
 
       const assignYourself = function () {
         const unassignedSelected = $dropdown.closest('.selectbox')
@@ -423,8 +427,9 @@ function UsersSelect(currentUser, els) {
         },
         opened: function(e) {
           const $el = $(e.currentTarget);
-          if ($dropdown.hasClass('js-issue-board-sidebar')) {
-            selectedId = parseInt($dropdown[0].dataset.selected, 10) || selectedIdDefault;
+          const selected = getSelected();
+          if ($dropdown.hasClass('js-issue-board-sidebar') && selected.length === 0) {
+            this.addInput($dropdown.data('field-name'), 0, {});
           }
           $el.find('.is-active').removeClass('is-active');
 
@@ -432,8 +437,10 @@ function UsersSelect(currentUser, els) {
             $el.find(`li[data-user-id="${id}"] .dropdown-menu-user-link`).addClass('is-active');
           }
 
-          if ($selectbox[0]) {
+          if (selected.length > 0) {
             getSelected().forEach(selectedId => highlightSelected(selectedId));
+          } else if ($dropdown.hasClass('js-issue-board-sidebar')) {
+            highlightSelected(0);
           } else {
             highlightSelected(selectedId);
           }
@@ -444,15 +451,19 @@ function UsersSelect(currentUser, els) {
           username = user.username ? "@" + user.username : "";
           avatar = user.avatar_url ? user.avatar_url : false;
 
-          let selected = user.id === parseInt(selectedId, 10);
+          let selected = false;
 
           if (this.multiSelect) {
+            selected = getSelected().find(u => user.id === u);
+
             const fieldName = this.fieldName;
             const field = $dropdown.closest('.selectbox').find("input[name='" + fieldName + "'][value='" + user.id + "']");
 
             if (field.length) {
               selected = true;
             }
+          } else {
+            selected = user.id === selectedId;
           }
 
           img = "";
diff --git a/app/views/projects/boards/components/sidebar/_assignee.html.haml b/app/views/projects/boards/components/sidebar/_assignee.html.haml
index 642da679f97..48f8c656080 100644
--- a/app/views/projects/boards/components/sidebar/_assignee.html.haml
+++ b/app/views/projects/boards/components/sidebar/_assignee.html.haml
@@ -10,7 +10,7 @@
 
   - if can?(current_user, :admin_issue, @project)
     .selectbox.hide-collapsed
-      %input{ type: "hidden",
+      %input.js-vue{ type: "hidden",
         name: "issue[assignee_ids][]",
         ":value" => "assignee.id",
         "v-if" => "issue.assignees",
@@ -18,7 +18,6 @@
       .dropdown
         %button.dropdown-menu-toggle.js-user-search.js-author-search.js-multiselect.js-save-user-data.js-issue-board-sidebar{ type: "button", ref: "assigneeDropdown", data: { toggle: "dropdown", field_name: "issue[assignee_ids][]", first_user: (current_user.username if current_user), current_user: "true", project_id: @project.id, null_user: "true", multi_select: "true", 'max-select' => 1, dropdown: { header: 'Assignee' } },
           ":data-issuable-id" => "issue.id",
-          ":data-selected" => "assigneeId",
           ":data-issue-update" => "'#{namespace_project_issues_path(@project.namespace, @project)}/' + issue.id + '.json'" }
           Select assignee
           = icon("chevron-down")
diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb
index 86c7954e60c..7a132dba1e9 100644
--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
@@ -26,9 +26,20 @@ RSpec.describe 'Dashboard Issues', feature: true do
     expect(page).not_to have_content(other_issue.title)
   end
 
+  it 'shows checkmark when unassigned is selected for assignee', js: true do
+    find('.js-assignee-search').click
+    find('li', text: 'Unassigned').click
+    find('.js-assignee-search').click
+
+    expect(find('li[data-user-id="0"] a.is-active')).to be_visible
+  end
+
   it 'shows issues when current user is author', js: true do
     find('#assignee_id', visible: false).set('')
     find('.js-author-search', match: :first).click
+
+    expect(find('li[data-user-id="null"] a.is-active')).to be_visible
+
     find('.dropdown-menu-author li a', match: :first, text: current_user.to_reference).click
     find('.js-author-search', match: :first).click