Merge pull request #5695 from rtibblesbot/issue-5691-941b2f

Remove ai_feature feature flag and ungate search recommendations

Author: bjester

contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchOrBrowseWindow.vue

@@ -400,7 +400,6 @@
       ...mapGetters('contentNode', ['getContentNodeAncestors']),
       ...mapGetters('currentChannel', ['currentChannel']),
       ...mapGetters('importFromChannels', ['savedSearchesExist']),
-      ...mapGetters(['isAIFeatureEnabled']),
       ...mapState('importFromChannels', ['selected']),
       isBrowsing() {
         return this.$route.name === RouteNames.IMPORT_FROM_CHANNELS_BROWSE;
@@ -432,10 +431,6 @@
         };
       },
       shouldShowRecommendations() {
-        if (!this.isAIFeatureEnabled) {
-          return false;
-        }
-
         if (this.embedTopicRequest === null) {
           return false;
         }

contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/__tests__/SearchOrBrowseWindow.spec.js

@@ -77,7 +77,6 @@ describe('SearchOrBrowseWindow', () => {
     getters = {
       'currentChannel/currentChannel': () => ({ language: 'en' }),
       'importFromChannels/savedSearchesExist': () => true,
-      isAIFeatureEnabled: () => true,
       'contentNode/getContentNodeAncestors': () => () => [{ id: 'node-1', title: 'Test folder' }],
     };
 
@@ -132,9 +131,7 @@ describe('SearchOrBrowseWindow', () => {
       actions: {
         showSnackbar: actions.showSnackbar,
       },
-      getters: {
-        isAIFeatureEnabled: getters.isAIFeatureEnabled,
-      },
+      getters: {},
     });
 
     const routes = [

contentcuration/contentcuration/frontend/shared/vuex/session/index.js

@@ -6,7 +6,6 @@ import { Session, User } from 'shared/data/resources';
 import { forceServerSync } from 'shared/data/serverSync';
 import translator from 'shared/translator';
 import { applyMods } from 'shared/data/applyRemoteChanges';
-import { FeatureFlagKeys } from 'shared/constants';
 
 function langCode(language) {
   // Turns a Django language name (en-gb) into an ISO language code (en-GB)
@@ -95,12 +94,6 @@ export default {
         return getters.isAdmin || Boolean(getters.featureFlags[flag]);
       };
     },
-    isAIFeatureEnabled(state, getters) {
-      if (getters.loggedIn) {
-        return getters.hasFeatureEnabled(FeatureFlagKeys.ai_feature);
-      }
-      return false;
-    },
   },
   actions: {
     saveSession(context, currentUser) {

contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js

@@ -1,5 +1,4 @@
 import vuexSessionModule from './index.js';
-import { FeatureFlagKeys } from 'shared/constants';
 
 describe('session module feature flag related getters', () => {
   let state;
@@ -12,7 +11,6 @@ describe('session module feature flag related getters', () => {
         },
       },
     };
-    state.currentUser.feature_flags[FeatureFlagKeys.ai_feature] = true;
   });
 
   describe('featureFlags', () => {
@@ -54,31 +52,4 @@ describe('session module feature flag related getters', () => {
       expect(getters.hasFeatureEnabled(state, getters)('false_flag')).toBe(false);
     });
   });
-
-  describe('isAIFeatureEnabled', () => {
-    let getters;
-    beforeEach(() => {
-      getters = {
-        loggedIn: true,
-        hasFeatureEnabled: vuexSessionModule.getters.hasFeatureEnabled(state, {
-          featureFlags: vuexSessionModule.getters.featureFlags(state),
-          isAdmin: false,
-        }),
-        isAIFeatureEnabled: vuexSessionModule.getters.isAIFeatureEnabled,
-      };
-    });
-    it('should return false if not logged in', () => {
-      getters.loggedIn = false;
-      expect(getters.isAIFeatureEnabled(state, getters)).toBe(false);
-    });
-
-    it('should return true if logged in and ai feature flag is true', () => {
-      expect(getters.isAIFeatureEnabled(state, getters)).toBe(true);
-    });
-
-    it('should return false if logged in and ai feature flag is false', () => {
-      state.currentUser.feature_flags[FeatureFlagKeys.ai_feature] = false;
-      expect(getters.isAIFeatureEnabled(state, getters)).toBe(false);
-    });
-  });
 });

contentcuration/contentcuration/static/feature_flags.json

@@ -9,11 +9,6 @@
       "description": "This no-op feature flag is excluded from non-dev environments",
       "$env": "development"
     },
-    "ai_feature":{
-      "type": "boolean",
-      "title":"Test AI feature",
-      "description": "Allow user access to AI features"
-    },
     "survey":{
       "type": "boolean",
       "title":"Test Survey feature",

contentcuration/contentcuration/tests/viewsets/test_recommendations.py

@@ -150,6 +150,21 @@ def test_recommendation_generic_error(self, mock_load_recommendations):
         self.assertEqual(response.content.decode(), error_message)
         mock_load_recommendations.assert_called_once()
 
+    @patch(
+        "contentcuration.utils.automation_manager.AutomationManager.load_recommendations"
+    )
+    def test_recommend_success_nonadmin_user(self, mock_load_recommendations):
+        user = testdata.user()
+        self.client.force_authenticate(user=user)
+        mock_load_recommendations.return_value = self.recommendations_list
+
+        response = self.client.post(
+            reverse("recommendations"), data=self.topics, format="json"
+        )
+
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response.json(), self.recommendations_list)
+
 
 class RecommendationsEventViewSetTestCase(StudioAPITestCase):
     @property

contentcuration/contentcuration/viewsets/recommendation.py

@@ -10,7 +10,6 @@
 from rest_framework.views import APIView
 
 from contentcuration.utils.automation_manager import AutomationManager
-from contentcuration.viewsets.user import IsAIFeatureEnabledForUser
 
 logger = logging.getLogger(__name__)
 
@@ -23,7 +22,6 @@ class RecommendationView(APIView):
 
     permission_classes = [
         IsAuthenticated,
-        IsAIFeatureEnabledForUser,
     ]
     manager = AutomationManager()
 

contentcuration/contentcuration/viewsets/user.py

@@ -56,27 +56,6 @@ def has_permission(self, request, view):
             return False
 
 
-class IsAIFeatureEnabledForUser(BasePermission):
-    """
-    Permission to check if the AI feature is enabled for a user.
-    """
-
-    def _can_user_access_feature(self, request):
-        try:
-            if request.user.is_admin:
-                return True
-            else:
-                return request.user.check_feature_flag("ai_feature")
-        except AttributeError:
-            return False
-
-    def has_permission(self, request, view):
-        return self._can_user_access_feature(request)
-
-    def has_object_permission(self, request, view, obj):
-        return self._can_user_access_feature(request)
-
-
 class UserListPagination(ValuesViewsetPageNumberPagination):
     page_size = None
     page_size_query_param = "page_size"