From c9c163c1a4f780de5ea2f246935bd4f7047ead14 Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Mon, 18 Sep 2023 14:39:43 +0530
Subject: [PATCH 1/3] Welcome AI Feature Flag

---
 .../frontend/shared/vuex/session/index.js     | 13 ++--
 .../shared/vuex/session/index.spec.js         | 65 +++++++++++++++++++
 2 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js

diff --git a/contentcuration/contentcuration/frontend/shared/vuex/session/index.js b/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
index d89a56e6d5..2cdd57ec5f 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
@@ -85,14 +85,11 @@ export default {
     featureFlags(state) {
       return state.currentUser.feature_flags || {};
     },
-    hasFeatureEnabled(state, getters) {
-      /**
-       * @param {string} flag - shared.constants.FeatureFlagKeys.*
-       * @return {Boolean}
-       */
-      return function(flag) {
-        return getters.isAdmin || Boolean(getters.featureFlags[flag]);
-      };
+    isAIFeatureEnabled(state, getters) {
+      if (getters.loggedIn) {
+        return Boolean(getters.featureFlags['ai_feature']);
+      }
+      return false;
     },
   },
   actions: {
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js b/contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js
new file mode 100644
index 0000000000..5b8d07a0d1
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js
@@ -0,0 +1,65 @@
+import vuexSessionModule from './index.js';
+
+describe('session module feature flag related getters', () => {
+  describe('featureFlags', () => {
+    let state, getters;
+
+    beforeEach(() => {
+      state = {
+        currentUser: {
+          feature_flags: {
+            flag1: true,
+            flag2: false,
+          },
+        },
+      };
+      getters = {
+        featureFlags: vuexSessionModule.getters.featureFlags,
+      };
+    });
+    it('should return feature flags from current user', () => {
+      const result = getters.featureFlags(state);
+      expect(result).toEqual(state.currentUser.feature_flags);
+    });
+
+    it('should return empty object if no feature flags set', () => {
+      state.currentUser = {};
+      const result = getters.featureFlags(state);
+      expect(result).toEqual({});
+    });
+  });
+
+  describe('isAIFeatureEnabled', () => {
+    let state, getters;
+
+    beforeEach(() => {
+      state = {
+        currentUser: {
+          feature_flags: {
+            ai_feature: true,
+          },
+        },
+      };
+      getters = {
+        loggedIn: false,
+        featureFlags: state.currentUser.feature_flags,
+        isAIFeatureEnabled: vuexSessionModule.getters.isAIFeatureEnabled,
+      };
+    });
+
+    it('should return false if not logged in', () => {
+      expect(getters.isAIFeatureEnabled(state, getters)).toBe(false);
+    });
+
+    it('should return true if logged in and ai feature flag is true', () => {
+      getters.loggedIn = true;
+      expect(getters.isAIFeatureEnabled(state, getters)).toBe(true);
+    });
+
+    it('should return false if logged in and ai feature flag is false', () => {
+      getters.loggedIn = true;
+      state.currentUser.feature_flags.ai_feature = false;
+      expect(getters.isAIFeatureEnabled(state, getters)).toBe(false);
+    });
+  });
+});

From 084dc9517ab7bb2e7572ec76d5457c8eb63e9480 Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Thu, 21 Sep 2023 22:54:54 +0530
Subject: [PATCH 2/3] Bring back hasFeatureEnabled, rewrite tests

---
 .../frontend/accounts/pages/Main.vue          |  6 +-
 .../channelList/views/ChannelListIndex.vue    |  2 +
 .../frontend/shared/vuex/session/index.js     | 12 +++-
 .../shared/vuex/session/index.spec.js         | 69 ++++++++++++-------
 4 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index 49833f60e2..88373472cb 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
@@ -116,7 +116,7 @@
 
 <script>
 
-  import { mapActions, mapState } from 'vuex';
+  import { mapActions, mapState, mapGetters } from 'vuex';
   import EmailField from 'shared/views/form/EmailField';
   import PasswordField from 'shared/views/form/PasswordField';
   import Banner from 'shared/views/Banner';
@@ -146,11 +146,15 @@
       ...mapState({
         offline: state => !state.connection.online,
       }),
+      ...mapGetters(['isAIFeatureEnabled']),
       nextParam() {
         const params = new URLSearchParams(window.location.search.substring(1));
         return params.get('next');
       },
     },
+    mounted() {
+      console.log('isAIFeatureEnabled from Main = ', this.isAIFeatureEnabled);
+    },
     methods: {
       ...mapActions(['login']),
       ...mapActions('policies', ['openPolicy']),
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
index 16cdf100f7..f999bc08c4 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
@@ -134,6 +134,7 @@
       }),
       ...mapGetters(['loggedIn']),
       ...mapGetters('channelList', ['invitations']),
+      ...mapGetters(['isAIFeatureEnabled']),
       fullPageError() {
         return this.$store.state.errors.fullPageError;
       },
@@ -218,6 +219,7 @@
       }
     },
     mounted() {
+      console.log('isAIFeatureEnabled from ChannelListIndex = ', this.isAIFeatureEnabled);
       if (localStorage.snackbar) {
         this.$store.dispatch('showSnackbarSimple', localStorage.snackbar);
         delete localStorage.snackbar;
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/session/index.js b/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
index 2cdd57ec5f..b0a2b10a05 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/session/index.js
@@ -6,6 +6,7 @@ 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)
@@ -85,9 +86,18 @@ export default {
     featureFlags(state) {
       return state.currentUser.feature_flags || {};
     },
+    hasFeatureEnabled(state, getters) {
+      /**
+       * @param {string} flag - shared.constants.FeatureFlagKeys.*
+       * @return {Boolean}
+       */
+      return function(flag) {
+        return getters.isAdmin || Boolean(getters.featureFlags[flag]);
+      };
+    },
     isAIFeatureEnabled(state, getters) {
       if (getters.loggedIn) {
-        return Boolean(getters.featureFlags['ai_feature']);
+        return getters.hasFeatureEnabled(FeatureFlagKeys.ai_feature);
       }
       return false;
     },
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js b/contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js
index 5b8d07a0d1..ef7e7308f3 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/session/index.spec.js
@@ -1,18 +1,23 @@
 import vuexSessionModule from './index.js';
+import { FeatureFlagKeys } from 'shared/constants';
 
 describe('session module feature flag related getters', () => {
-  describe('featureFlags', () => {
-    let state, getters;
+  let state;
+  beforeEach(() => {
+    state = {
+      currentUser: {
+        feature_flags: {
+          true_flag: true,
+          false_flag: false,
+        },
+      },
+    };
+    state.currentUser.feature_flags[FeatureFlagKeys.ai_feature] = true;
+  });
 
+  describe('featureFlags', () => {
+    let getters;
     beforeEach(() => {
-      state = {
-        currentUser: {
-          feature_flags: {
-            flag1: true,
-            flag2: false,
-          },
-        },
-      };
       getters = {
         featureFlags: vuexSessionModule.getters.featureFlags,
       };
@@ -29,36 +34,50 @@ describe('session module feature flag related getters', () => {
     });
   });
 
-  describe('isAIFeatureEnabled', () => {
-    let state, getters;
-
+  describe('hasFeatureEnabled', () => {
+    let getters;
     beforeEach(() => {
-      state = {
-        currentUser: {
-          feature_flags: {
-            ai_feature: true,
-          },
-        },
-      };
       getters = {
-        loggedIn: false,
         featureFlags: state.currentUser.feature_flags,
-        isAIFeatureEnabled: vuexSessionModule.getters.isAIFeatureEnabled,
+        hasFeatureEnabled: vuexSessionModule.getters.hasFeatureEnabled,
       };
     });
+    it('for admin user returns true even when the flag value is false', () => {
+      getters.isAdmin = true;
+      expect(getters.hasFeatureEnabled(state, getters)('true_flag')).toBe(true);
+      expect(getters.hasFeatureEnabled(state, getters)('false_flag')).toBe(true);
+    });
 
+    it('returns flag value for non-admin user', () => {
+      getters.isAdmin = false;
+      expect(getters.hasFeatureEnabled(state, getters)('true_flag')).toBe(true);
+      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', () => {
-      getters.loggedIn = true;
       expect(getters.isAIFeatureEnabled(state, getters)).toBe(true);
     });
 
     it('should return false if logged in and ai feature flag is false', () => {
-      getters.loggedIn = true;
-      state.currentUser.feature_flags.ai_feature = false;
+      state.currentUser.feature_flags[FeatureFlagKeys.ai_feature] = false;
       expect(getters.isAIFeatureEnabled(state, getters)).toBe(false);
     });
   });

From aa90f573b75cf8e50a89f0e06f99bfede4119b45 Mon Sep 17 00:00:00 2001
From: Vivek Agrawal <vivekmittalagrawal@gmail.com>
Date: Thu, 21 Sep 2023 22:57:59 +0530
Subject: [PATCH 3/3] Cleanup and ready :rocket:

---
 .../contentcuration/frontend/accounts/pages/Main.vue        | 6 +-----
 .../frontend/channelList/views/ChannelListIndex.vue         | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index 88373472cb..49833f60e2 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
@@ -116,7 +116,7 @@
 
 <script>
 
-  import { mapActions, mapState, mapGetters } from 'vuex';
+  import { mapActions, mapState } from 'vuex';
   import EmailField from 'shared/views/form/EmailField';
   import PasswordField from 'shared/views/form/PasswordField';
   import Banner from 'shared/views/Banner';
@@ -146,15 +146,11 @@
       ...mapState({
         offline: state => !state.connection.online,
       }),
-      ...mapGetters(['isAIFeatureEnabled']),
       nextParam() {
         const params = new URLSearchParams(window.location.search.substring(1));
         return params.get('next');
       },
     },
-    mounted() {
-      console.log('isAIFeatureEnabled from Main = ', this.isAIFeatureEnabled);
-    },
     methods: {
       ...mapActions(['login']),
       ...mapActions('policies', ['openPolicy']),
diff --git a/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue b/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
index f999bc08c4..16cdf100f7 100644
--- a/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
+++ b/contentcuration/contentcuration/frontend/channelList/views/ChannelListIndex.vue
@@ -134,7 +134,6 @@
       }),
       ...mapGetters(['loggedIn']),
       ...mapGetters('channelList', ['invitations']),
-      ...mapGetters(['isAIFeatureEnabled']),
       fullPageError() {
         return this.$store.state.errors.fullPageError;
       },
@@ -219,7 +218,6 @@
       }
     },
     mounted() {
-      console.log('isAIFeatureEnabled from ChannelListIndex = ', this.isAIFeatureEnabled);
       if (localStorage.snackbar) {
         this.$store.dispatch('showSnackbarSimple', localStorage.snackbar);
         delete localStorage.snackbar;