Merge branch...

Merge branch '207497-display-warning-when-service-desk-issue-gets-moved-to-a-project-without-service-desk-enabled' into 'master'

Display warning for issues moved from service desk on frontend

See merge request gitlab-org/gitlab!31803

app/assets/javascripts/issue.js

@@ -6,6 +6,7 @@ import { addDelimiter } from './lib/utils/text_utility';
 import flash from './flash';
 import CreateMergeRequestDropdown from './create_merge_request_dropdown';
 import IssuablesHelper from './helpers/issuables_helper';
+import { joinPaths } from '~/lib/utils/url_utility';
 import { __ } from './locale';
 
 export default class Issue {
@@ -14,6 +15,16 @@ export default class Issue {
 
     if ($('.js-close-blocked-issue-warning').length) this.initIssueWarningBtnEventListener();
 
+    if ($('.js-alert-moved-from-service-desk-warning').length) {
+      const trimmedPathname = window.location.pathname.slice(1);
+      this.alertMovedFromServiceDeskDismissedKey = joinPaths(
+        trimmedPathname,
+        'alert-issue-moved-from-service-desk-dismissed',
+      );
+
+      this.initIssueMovedFromServiceDeskDismissHandler();
+    }
+
     Issue.$btnNewBranch = $('#new-branch');
     Issue.createMrDropdownWrap = document.querySelector('.create-mr-dropdown-wrap');
 
@@ -167,6 +178,21 @@ export default class Issue {
     });
   }
 
+  initIssueMovedFromServiceDeskDismissHandler() {
+    const alertMovedFromServiceDeskWarning = $('.js-alert-moved-from-service-desk-warning');
+
+    if (!localStorage.getItem(this.alertMovedFromServiceDeskDismissedKey)) {
+      alertMovedFromServiceDeskWarning.show();
+    }
+
+    alertMovedFromServiceDeskWarning.on('click', '.js-close', e => {
+      e.preventDefault();
+      e.stopImmediatePropagation();
+      alertMovedFromServiceDeskWarning.remove();
+      localStorage.setItem(this.alertMovedFromServiceDeskDismissedKey, true);
+    });
+  }
+
   static submitNoteForm(form) {
     const noteText = form.find('textarea.js-note-text').val();
     if (noteText && noteText.trim().length > 0) {

app/views/projects/issues/show.html.haml

@@ -11,6 +11,7 @@
 - can_create_issue = show_new_issue_link?(@project)
 
 = render_if_exists "projects/issues/alert_blocked", issue: @issue, current_user: current_user
+= render_if_exists "projects/issues/alert_moved_from_service_desk", issue: @issue
 
 .detail-page-header
   .detail-page-header-body

ee/app/views/projects/issues/_alert_moved_from_service_desk.html.haml

+- return unless show_moved_service_desk_issue_warning?(issue)
+- service_desk_link_url = help_page_path('user/project/service_desk')
+- service_desk_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: service_desk_link_url }
+
+.hide.gl-alert.gl-alert-warning.js-alert-moved-from-service-desk-warning.gl-mt-5{ role: 'alert' }
+  = sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
+  %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
+    = sprite_icon('close', size: 16, css_class: 'gl-icon')
+  .gl-alert-body.gl-mr-3
+    = s_('This project does not have %{service_desk_link_start}Service Desk%{service_desk_link_end} enabled, so the user who created the issue will no longer receive email notifications about new activity.').html_safe % { service_desk_link_start: service_desk_link_start, service_desk_link_end: '</a>'.html_safe }

ee/changelogs/unreleased/207497-display-warning-when-service-desk-issue-gets-moved-to-a-project.yml

+---
+title: Display warning for issues moved from service desk on frontend
+merge_request: 31803
+author:
+type: fixed

locale/gitlab.pot

@@ -22388,6 +22388,9 @@ msgstr ""
 msgid "This project does not belong to a group and can therefore not make use of group Runners."
 msgstr ""
 
+msgid "This project does not have %{service_desk_link_start}Service Desk%{service_desk_link_end} enabled, so the user who created the issue will no longer receive email notifications about new activity."
+msgstr ""
+
 msgid "This project does not have a wiki homepage yet"
 msgstr ""
 

spec/features/issues/move_spec.rb

@@ -95,6 +95,45 @@ describe 'issue move to another project' do
         expect(page).to have_no_selector('#move_to_project_id')
       end
     end
+
+    context 'service desk issue moved to a project with service desk disabled', :js do
+      let(:project_title) { 'service desk disabled project' }
+      let(:warning_selector) { '.js-alert-moved-from-service-desk-warning' }
+      let(:namespace) { create(:namespace) }
+      let(:regular_project) { create(:project, title: project_title, service_desk_enabled: false) }
+      let(:service_desk_project) { build(:project, :private, namespace: namespace, service_desk_enabled: true) }
+      let(:service_desk_issue) { create(:issue, project: service_desk_project, author: ::User.support_bot) }
+
+      before do
+        allow(::Gitlab).to receive(:com?).and_return(true)
+        allow(::Gitlab::IncomingEmail).to receive(:enabled?).and_return(true)
+        allow(::Gitlab::IncomingEmail).to receive(:supports_wildcard?).and_return(true)
+
+        regular_project.add_reporter(user)
+        service_desk_project.add_reporter(user)
+
+        visit issue_path(service_desk_issue)
+
+        find('.js-move-issue').click
+        wait_for_requests
+        find('.js-move-issue-dropdown-item', text: project_title).click
+        find('.js-move-issue-confirmation-button').click
+      end
+
+      it 'shows an alert after being moved' do
+        expect(page).to have_content('This project does not have Service Desk enabled')
+      end
+
+      it 'does not show an alert after being dismissed' do
+        find("#{warning_selector} .js-close").click
+
+        expect(page).to have_no_selector(warning_selector)
+
+        page.refresh
+
+        expect(page).to have_no_selector(warning_selector)
+      end
+    end
   end
 
   def issue_path(issue)