From 47759427bab3c11bacacddb61c99ee3ab836afed Mon Sep 17 00:00:00 2001
From: Nimisha Asthagiri <nasthagiri@edx.org>
Date: Sat, 6 Apr 2019 17:01:50 -0400
Subject: [PATCH] Learner Profile Toggles: Annotate and Remove outdated ones
 ARCH-453

---
 openedx/features/learner_profile/__init__.py  | 18 ++++++++-----
 .../js/learner_profile_factory.js             |  5 ----
 .../learner_profile/views/learner_profile.py  | 27 ++-----------------
 3 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/openedx/features/learner_profile/__init__.py b/openedx/features/learner_profile/__init__.py
index ea54674b51..cfda421ce5 100644
--- a/openedx/features/learner_profile/__init__.py
+++ b/openedx/features/learner_profile/__init__.py
@@ -8,12 +8,16 @@ from openedx.core.djangoapps.waffle_utils import WaffleFlag, WaffleFlagNamespace
 # Namespace for learner profile waffle flags.
 WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name='learner_profile')
 
-# Waffle flag for showing a message about the new profile features.
-# TODO: LEARNER-2554: 09/2017: Remove flag once message is no longer needed.
-SHOW_PROFILE_MESSAGE = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'show_message')
-
-# Waffle flag to show achievements on the learner profile.
-SHOW_ACHIEVEMENTS_FLAG = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'show_achievements', flag_undefined_default=True)
-
 # Waffle flag to redirect to another learner profile experience.
+# .. toggle_name: REDIRECT_TO_PROFILE_MICROFRONTEND
+# .. toggle_type: waffle_flag
+# .. toggle_default: False
+# .. toggle_description: Supports staged rollout of a new micro-frontend-based implementation of the profile page.
+# .. toggle_category: micro-frontend
+# .. toggle_use_cases: incremental_release, open_edx
+# .. toggle_creation_date: 2019-02-19
+# .. toggle_expiration_date: 2020-12-31
+# .. toggle_warnings: Remember to also set PROFILE_MICROFRONTEND_URL before this toggle is enabled.
+# .. toggle_tickets: DEPR-17
+# .. toggle_status: supported
 REDIRECT_TO_PROFILE_MICROFRONTEND = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'redirect_to_microfrontend')
diff --git a/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js b/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
index aa5dbeca66..321b1080bc 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
@@ -25,11 +25,6 @@
         return function(options) {
             var $learnerProfileElement = $('.wrapper-profile');
 
-            // TODO: LEARNER-2554: 09/2017: Remove this hiding logic when the message is removed.
-            $('.action-dismiss').click(function() {
-                $('.user-messages').hide();
-            });
-
             var accountSettingsModel = new AccountSettingsModel(
                 _.extend(
                     options.account_settings_data,
diff --git a/openedx/features/learner_profile/views/learner_profile.py b/openedx/features/learner_profile/views/learner_profile.py
index 6f9e289d84..f5f74381aa 100644
--- a/openedx/features/learner_profile/views/learner_profile.py
+++ b/openedx/features/learner_profile/views/learner_profile.py
@@ -18,12 +18,11 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 from openedx.core.djangoapps.user_api.accounts.api import get_account_settings
 from openedx.core.djangoapps.user_api.errors import UserNotAuthorized, UserNotFound
 from openedx.core.djangoapps.user_api.preferences.api import get_user_preferences
-from openedx.core.djangoapps.util.user_messages import PageLevelMessages
 from openedx.core.djangolib.markup import HTML, Text
 from openedx.features.journals.api import journals_enabled
 from student.models import User
 
-from .. import SHOW_PROFILE_MESSAGE, REDIRECT_TO_PROFILE_MICROFRONTEND
+from .. import REDIRECT_TO_PROFILE_MICROFRONTEND
 
 from learner_achievements import LearnerAchievementsFragmentView
 
@@ -53,32 +52,10 @@ def learner_profile(request, username):
 
     try:
         context = learner_profile_context(request, username, request.user.is_staff)
-        # TODO: LEARNER-2554: 09/2017: Remove message and cookie logic when we no longer want this message
-        message_viewed = False
-        if (context['own_profile'] and
-                SHOW_PROFILE_MESSAGE.is_enabled() and
-                request.COOKIES.get('profile-message-viewed', '') != 'True'):
-            message_text = Text(_(
-                u'Welcome to the new learner profile page. Your full profile now displays more '
-                u'information to other learners. You can instead choose to display a limited '
-                u'profile. {learn_more_link_start}Learn more{learn_more_link_end}'
-            )).format(
-                learn_more_link_start=HTML(
-                    '<a href="https://edx.readthedocs.io/projects/open-edx-learner-guide/en/'
-                    'latest/SFD_dashboard_profile_SectionHead.html#adding-profile-information">'
-                ),
-                learn_more_link_end=HTML('</a>')
-            )
-            PageLevelMessages.register_info_message(request, message_text, dismissable=True)
-            message_viewed = True
-        response = render_to_response(
+        return render_to_response(
             'learner_profile/learner_profile.html',
             context
         )
-
-        if message_viewed:
-            response.set_cookie('profile-message-viewed', 'True')
-        return response
     except (UserNotAuthorized, UserNotFound, ObjectDoesNotExist):
         raise Http404