From 8ea03ad9d2e4ffc4ade3c58689ae7222b52d4cd9 Mon Sep 17 00:00:00 2001
From: Bill DeRusha <bill@edx.org>
Date: Thu, 1 Feb 2018 12:05:11 -0500
Subject: [PATCH] Create generic support ticket interface (remove zendesk
 specific code)

---
 .../support/static/support/jsx/logged_in_user.jsx      |  2 +-
 .../support/static/support/jsx/single_support_form.jsx |  6 +++---
 lms/djangoapps/support/views/contact_us.py             | 10 +++++-----
 lms/templates/support/contact_us.html                  |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lms/djangoapps/support/static/support/jsx/logged_in_user.jsx b/lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
index f8994005c5..6a1f31735c 100644
--- a/lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
+++ b/lms/djangoapps/support/static/support/jsx/logged_in_user.jsx
@@ -92,7 +92,7 @@ LoggedInUser.propTypes = {
   setErrorState: PropTypes.func.isRequired,
   submitForm: PropTypes.func.isRequired,
   userInformation: PropTypes.arrayOf(PropTypes.object).isRequired,
-  zendeskProxyUrl: PropTypes.string.isRequired,
+  submitFormUrl: PropTypes.string.isRequired,
 };
 
 export default LoggedInUser;
diff --git a/lms/djangoapps/support/static/support/jsx/single_support_form.jsx b/lms/djangoapps/support/static/support/jsx/single_support_form.jsx
index 2ca8aa3ea6..0b3d6b6cbc 100644
--- a/lms/djangoapps/support/static/support/jsx/single_support_form.jsx
+++ b/lms/djangoapps/support/static/support/jsx/single_support_form.jsx
@@ -31,7 +31,7 @@ class RenderForm extends React.Component {
   }
 
   submitForm() {
-    const url = this.props.context.zendeskProxyUrl,
+    const url = this.props.context.submitFormUrl,
       $userInfo = $('.user-info'),
       request = new XMLHttpRequest(),
       $course = $('#course'),
@@ -40,7 +40,7 @@ class RenderForm extends React.Component {
         comment: {
           body: $('#message').val(),
         },
-        tags: this.props.context.zendeskTags,
+        tags: this.props.context.tags,
       };
 
     let course;
@@ -116,7 +116,7 @@ class RenderForm extends React.Component {
     if (this.props.context.user) {
       userElement = (<LoggedInUser
         userInformation={this.props.context.user}
-        zendeskProxyUrl={this.props.context.zendeskProxyUrl}
+        submitFormUrl={this.props.context.submitFormUrl}
         setErrorState={this.setErrorState}
         submitForm={this.submitForm}
       />);
diff --git a/lms/djangoapps/support/views/contact_us.py b/lms/djangoapps/support/views/contact_us.py
index 2776dd5af5..e6abfce96b 100644
--- a/lms/djangoapps/support/views/contact_us.py
+++ b/lms/djangoapps/support/views/contact_us.py
@@ -21,21 +21,21 @@ class ContactUsView(View):
             'custom_fields': settings.ZENDESK_CUSTOM_FIELDS
         }
 
-        # Tag all issues with LMS to distinguish channel in Zendesk; requested by student support team
-        zendesk_tags = ['LMS']
+        # Tag all issues with LMS to distinguish channel which received the request
+        tags = ['LMS']
 
         # Per edX support, we would like to be able to route feedback items by site via tagging
         current_site_name = configuration_helpers.get_value("SITE_NAME")
         if current_site_name:
             current_site_name = current_site_name.replace(".", "_")
-            zendesk_tags.append("site_name_{site}".format(site=current_site_name))
+            tags.append("site_name_{site}".format(site=current_site_name))
 
         if request.user.is_authenticated():
             context['user_enrollments'] = CourseEnrollment.enrollments_for_user(request.user)
             enterprise_learner_data = enterprise_api.get_enterprise_learner_data(site=request.site, user=request.user)
             if enterprise_learner_data:
-                zendesk_tags.append('enterprise_learner')
+                tags.append('enterprise_learner')
 
-        context['zendesk_tags'] = zendesk_tags
+        context['tags'] = tags
 
         return render_to_response("support/contact_us.html", context)
diff --git a/lms/templates/support/contact_us.html b/lms/templates/support/contact_us.html
index 4972e82585..f13831eaf8 100644
--- a/lms/templates/support/contact_us.html
+++ b/lms/templates/support/contact_us.html
@@ -33,9 +33,9 @@ from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_j
             'loginQuery': "${login_query() | n, js_escaped_string}",
             'dashboardUrl': "${reverse('dashboard') | n, js_escaped_string}",
             'homepageUrl': "${marketing_link('ROOT') | n, js_escaped_string}",
-            'zendeskProxyUrl': "${reverse('zendesk_proxy_v1') | n, js_escaped_string}",
+            'submitFormUrl': "${reverse('zendesk_proxy_v1') | n, js_escaped_string}",
             'customFields': ${custom_fields | n, dump_js_escaped_json},
-            'zendeskTags': ${zendesk_tags | n, dump_js_escaped_json},
+            'tags': ${tags | n, dump_js_escaped_json},
         }
 
         % if user.is_authenticated():