From 6fd6605eed749d82d60dc7fe14d2e5fb29540a0f Mon Sep 17 00:00:00 2001
From: Carla Duarte <cduarte@edx.org>
Date: Fri, 8 May 2020 14:31:22 -0400
Subject: [PATCH] Remove Shorten Welcome Message flag

Removed use of the 'shorten_welcome_message' waffle flag

AA-108
---
 openedx/features/course_experience/__init__.py                 | 3 ---
 .../static/course_experience/js/WelcomeMessage.js              | 2 +-
 .../static/course_experience/js/spec/WelcomeMessage_spec.js    | 1 -
 .../templates/course_experience/welcome-message-fragment.html  | 1 -
 openedx/features/course_experience/views/welcome_message.py    | 2 --
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/openedx/features/course_experience/__init__.py b/openedx/features/course_experience/__init__.py
index c84d302e2a..5829ef695d 100644
--- a/openedx/features/course_experience/__init__.py
+++ b/openedx/features/course_experience/__init__.py
@@ -85,9 +85,6 @@ RELATIVE_DATES_FLAG = ExperimentWaffleFlag(WAFFLE_FLAG_NAMESPACE, 'relative_date
 # Waffle flag to enable user calendar syncing
 CALENDAR_SYNC_FLAG = CourseWaffleFlag(WAFFLE_FLAG_NAMESPACE, 'calendar_sync')
 
-# Waffle flag to ellipsize course welcome messages if they are too long
-SHORTEN_WELCOME_MESSAGE_FLAG = CourseWaffleFlag(WAFFLE_FLAG_NAMESPACE, 'shorten_welcome_message')
-
 
 def course_home_page_title(course):  # pylint: disable=unused-argument
     """
diff --git a/openedx/features/course_experience/static/course_experience/js/WelcomeMessage.js b/openedx/features/course_experience/static/course_experience/js/WelcomeMessage.js
index d0a3683f1d..e865563f85 100644
--- a/openedx/features/course_experience/static/course_experience/js/WelcomeMessage.js
+++ b/openedx/features/course_experience/static/course_experience/js/WelcomeMessage.js
@@ -42,7 +42,7 @@ export class WelcomeMessage {  // eslint-disable-line import/prefer-default-expo
     // "Show More" support for welcome messages
     const messageContent = document.querySelector('#welcome-message-content');
     const fullText = messageContent.innerHTML;
-    if (options.shortenWelcomeMessage && clampHtmlByWords(messageContent, 100) < 0) {
+    if (clampHtmlByWords(messageContent, 100) < 0) {
       const showMoreButton = document.querySelector('#welcome-message-show-more');
       const shortText = messageContent.innerHTML;
 
diff --git a/openedx/features/course_experience/static/course_experience/js/spec/WelcomeMessage_spec.js b/openedx/features/course_experience/static/course_experience/js/spec/WelcomeMessage_spec.js
index 9f5595a5c0..daea7536a3 100644
--- a/openedx/features/course_experience/static/course_experience/js/spec/WelcomeMessage_spec.js
+++ b/openedx/features/course_experience/static/course_experience/js/spec/WelcomeMessage_spec.js
@@ -90,7 +90,6 @@ describe('Welcome Message factory', () => {
       loadFixtures('course_experience/fixtures/welcome-message-fragment.html');
       new WelcomeMessage({  // eslint-disable-line no-new
         dismissUrl: endpointUrl,
-        shortenWelcomeMessage: true,
       });
     });
 
diff --git a/openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html b/openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
index 5e2568a824..596b5e4377 100644
--- a/openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
+++ b/openedx/features/course_experience/templates/course_experience/welcome-message-fragment.html
@@ -37,6 +37,5 @@ from openedx.core.djangolib.markup import HTML
 <%static:webpack entry="WelcomeMessage">
     new WelcomeMessage({
         dismissUrl: "${dismiss_url | n, js_escaped_string}",
-        shortenWelcomeMessage: ${shorten_welcome_message | n, dump_js_escaped_json},
     });
 </%static:webpack>
diff --git a/openedx/features/course_experience/views/welcome_message.py b/openedx/features/course_experience/views/welcome_message.py
index ce5636059d..324ad5b367 100644
--- a/openedx/features/course_experience/views/welcome_message.py
+++ b/openedx/features/course_experience/views/welcome_message.py
@@ -14,7 +14,6 @@ from web_fragments.fragment import Fragment
 from lms.djangoapps.courseware.courses import get_course_with_access
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
 from openedx.core.djangoapps.user_api.course_tag.api import get_course_tag, set_course_tag
-from openedx.features.course_experience import SHORTEN_WELCOME_MESSAGE_FLAG
 
 from .course_updates import get_ordered_updates
 
@@ -44,7 +43,6 @@ class WelcomeMessageFragmentView(EdxFragmentView):
         context = {
             'dismiss_url': dismiss_url,
             'welcome_message_html': welcome_message_html,
-            'shorten_welcome_message': SHORTEN_WELCOME_MESSAGE_FLAG.is_enabled(course_key),
         }
 
         if get_course_tag(request.user, course_key, PREFERENCE_KEY) == 'False':