Merge pull request #6447 from keshavvinayak01/master

Fixed remove_search_analytics issue

Author: stsewd

docs/guides/feature-flags.rst

@@ -35,6 +35,4 @@ e.g. python-reno release notes manager is known to do that
 
 ``USE_TESTING_BUILD_IMAGE``: :featureflags:`USE_TESTING_BUILD_IMAGE`
 
-``EXTERNAL_VERSION_BUILD``: :featureflags:`EXTERNAL_VERSION_BUILD`
-
-``SEARCH_ANALYTICS``: :featureflags:`SEARCH_ANALYTICS`
+``EXTERNAL_VERSION_BUILD``: :featureflags:`EXTERNAL_VERSION_BUILD`

readthedocs/projects/models.py

@@ -1480,7 +1480,6 @@ def add_features(sender, **kwargs):
     EXTERNAL_VERSION_BUILD = 'external_version_build'
     UPDATE_CONDA_STARTUP = 'update_conda_startup'
     CONDA_APPEND_CORE_REQUIREMENTS = 'conda_append_core_requirements'
-    SEARCH_ANALYTICS = 'search_analytics'
 
     FEATURES = (
         (USE_SPHINX_LATEST, _('Use latest version of Sphinx')),
@@ -1532,10 +1531,7 @@ def add_features(sender, **kwargs):
             CONDA_APPEND_CORE_REQUIREMENTS,
             _('Append Read the Docs core requirements to environment.yml file'),
         ),
-        (
-            SEARCH_ANALYTICS,
-            _('Enable search analytics'),
-        )
+
     )
 
     projects = models.ManyToManyField(

readthedocs/projects/views/private.py

@@ -1006,12 +1006,6 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         project = self.get_project()
 
-        context['show_analytics'] = project.has_feature(
-            Feature.SEARCH_ANALYTICS,
-        )
-        if not context['show_analytics']:
-            return context
-
         # data for plotting the line-chart
         query_count_of_1_month = SearchQuery.generate_queries_count_of_one_month(
             project.slug,

readthedocs/rtd_tests/tests/test_views.py

@@ -278,7 +278,7 @@ def setUp(self):
         test_time = timezone.datetime(2019, 8, 2, 12, 0)
         self.test_time = timezone.make_aware(test_time)
 
-        get(Feature, projects=[self.pip], feature_id=Feature.SEARCH_ANALYTICS)
+        get(Feature, projects=[self.pip])
 
     def test_top_queries(self):
         with mock.patch('django.utils.timezone.now') as test_time: