Skip to content

Improve project service desk settings

Luke Bennett requested to merge proj-settings-ok-service-desk-settings-only into master

What does this MR do?

Part of larger MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10318

This is just the changes for the service desk settings panels.

  • redesign the ‘Service desk’ section as indicated (button tooltip: Copy to clipboard)

Screenshot_2019-03-19_at_01.01.05

Screenshot_2019-03-21_at_18.12.33

How do I see the service desk panel?

see diff 
diff --git a/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue b/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
index 0bba340f11c..a82eea7471d 100644
--- a/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
+++ b/ee/app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue
@@ -82,6 +82,7 @@ export default {

     onEnableToggled(isChecked) {
       this.isEnabled = isChecked;
+      return;
       this.store.resetIncomingEmail();
       if (this.flash) {
         this.flash.remove();
diff --git a/ee/app/views/projects/_service_desk_settings.html.haml b/ee/app/views/projects/_service_desk_settings.html.haml
index 51958620be4..b5398e95459 100644
--- a/ee/app/views/projects/_service_desk_settings.html.haml
+++ b/ee/app/views/projects/_service_desk_settings.html.haml
@@ -1,4 +1,4 @@
-- if EE::Gitlab::ServiceDesk.enabled?(project: @project) || (show_promotions? && show_callout?('promote_service_desk_dismissed'))
+- if true || EE::Gitlab::ServiceDesk.enabled?(project: @project) || (show_promotions? && show_callout?('promote_service_desk_dismissed'))
   - expanded = Rails.env.test?
   %section.settings.js-service-desk-setting-wrapper.no-animate#js-service-desk{ class: ('expanded' if expanded) }
     .settings-header
@@ -8,9 +8,9 @@
       - link_start = "<a href='#{help_page_path('user/project/service_desk')}' target='_blank' rel='noopener noreferrer'>".html_safe
       %p= _('Enable/disable your service desk. %{link_start}Learn more about service desk%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
     .settings-content
-      - if EE::Gitlab::ServiceDesk.enabled?(project: @project)
+      - if true || EE::Gitlab::ServiceDesk.enabled?(project: @project)
         .js-service-desk-setting-root{ data: { endpoint: project_service_desk_path(@project),
           enabled: "#{@project.service_desk_enabled}",
-          incoming_email: (@project.service_desk_address if @project.service_desk_enabled) } }
+          incoming_email: 'youre@mocking.it' || (@project.service_desk_address if @project.service_desk_enabled) } }
       - elsif show_promotions? && show_callout?('promote_service_desk_dismissed')
         = render 'shared/promotions/promote_servicedesk'

What are the relevant issue numbers?

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/49738

Does this MR meet the acceptance criteria?

Edited by Luke Bennett

Merge request reports