Merge branch...

Merge branch '7150-the-weight-assignment-box-shows-up-when-the-sidebar-is-collapsed-even-if-you-don-t-have' into 'master'

Fix issue trying to edit weight with collapsed sidebar as guest

Closes #7150

See merge request gitlab-org/gitlab!20431

changelogs/unreleased/7150-the-weight-assignment-box-shows-up-when-the-sidebar-is-collapsed-eve.yml

+---
+title: Fix issue trying to edit weight with collapsed sidebar as guest
+merge_request: 20431
+author:
+type: fixed

ee/app/assets/javascripts/sidebar/components/weight/weight.vue

@@ -118,7 +118,9 @@ export default {
       }
     },
     onCollapsedClick() {
-      this.showEditField(true);
+      if (this.editable) {
+        this.showEditField(true);
+      }
       this.collapsedAfterUpdate = true;
     },
     onSubmit(e) {

ee/spec/features/issues/issue_sidebar_spec.rb

@@ -50,7 +50,38 @@ describe 'Issue Sidebar' do
     end
   end
 
+  context 'as a guest' do
+    before do
+      project.add_guest(user)
+      visit_issue(project, issue)
+    end
+
+    it 'does not have a option to edit weight' do
+      expect(page).not_to have_selector('.block.weight .js-weight-edit-link')
+    end
+  end
+
+  context 'as a guest, interacting with collapsed sidebar', :js do
+    before do
+      project.add_guest(user)
+      resize_screen_sm
+      visit_issue(project, issue)
+    end
+
+    it 'edit weight field does not appear after clicking on weight when sidebar is collapsed then expanding it' do
+      find('.js-weight-collapsed-block').click
+      # Expand sidebar
+      open_issue_sidebar
+      expect(page).not_to have_selector('.block.weight .form-control')
+    end
+  end
+
   def visit_issue(project, issue)
     visit project_issue_path(project, issue)
   end
+
+  def open_issue_sidebar
+    find('aside.right-sidebar.right-sidebar-collapsed .js-sidebar-toggle').click
+    find('aside.right-sidebar.right-sidebar-expanded')
+  end
 end