fix the cached feature flag

Author: lerouxb

packages/compass-assistant/src/compass-assistant-provider.spec.tsx

@@ -107,7 +107,7 @@ describe('useAssistantActions', function () {
     return TestWrapper;
   };
 
-  it('returns empty object when AI features are disabled via isAIFeatureEnabled', function () {
+  it('returns mostly empty object when AI features are disabled via isAIFeatureEnabled', function () {
     const { result } = renderHook(() => useAssistantActions(), {
       wrapper: createWrapper(createMockChat({ messages: [] })),
       preferences: {
@@ -119,10 +119,10 @@ describe('useAssistantActions', function () {
       },
     });
 
-    expect(result.current).to.deep.equal({});
+    expect(result.current).to.have.keys(['getIsAssistantEnabled']);
   });
 
-  it('returns empty object when enableGenAIFeaturesAtlasOrg is disabled', function () {
+  it('returns mostly empty object when enableGenAIFeaturesAtlasOrg is disabled', function () {
     const { result } = renderHook(() => useAssistantActions(), {
       wrapper: createWrapper(createMockChat({ messages: [] })),
       preferences: {
@@ -133,10 +133,10 @@ describe('useAssistantActions', function () {
       },
     });
 
-    expect(result.current).to.deep.equal({});
+    expect(result.current).to.have.keys(['getIsAssistantEnabled']);
   });
 
-  it('returns empty object when cloudFeatureRolloutAccess is disabled', function () {
+  it('returns mostly empty object when cloudFeatureRolloutAccess is disabled', function () {
     const { result } = renderHook(() => useAssistantActions(), {
       wrapper: createWrapper(createMockChat({ messages: [] })),
       preferences: {
@@ -147,10 +147,10 @@ describe('useAssistantActions', function () {
       },
     });
 
-    expect(result.current).to.deep.equal({});
+    expect(result.current).to.have.keys(['getIsAssistantEnabled']);
   });
 
-  it('returns empty object when enableAIAssistant preference is disabled', function () {
+  it('returns mostly empty object when enableAIAssistant preference is disabled', function () {
     const { result } = renderHook(() => useAssistantActions(), {
       wrapper: createWrapper(createMockChat({ messages: [] })),
       preferences: {
@@ -161,7 +161,7 @@ describe('useAssistantActions', function () {
       },
     });
 
-    expect(result.current).to.deep.equal({});
+    expect(result.current).to.have.keys(['getIsAssistantEnabled']);
   });
 
   it('returns actions when both AI features and assistant flag are enabled', function () {

packages/compass-assistant/src/compass-assistant-provider.tsx

@@ -74,7 +74,9 @@ type AssistantActionsContextType = {
 type AssistantActionsType = Omit<
   AssistantActionsContextType,
   'ensureOptInAndSend' | 'clearChat'
->;
+> & {
+  getIsAssistantEnabled: () => boolean;
+};
 
 export const AssistantActionsContext =
   createContext<AssistantActionsContextType>({
@@ -90,7 +92,9 @@ export function useAssistantActions(): AssistantActionsType {
   const isAIFeatureEnabled = useIsAIFeatureEnabled();
   const isAssistantFlagEnabled = usePreference('enableAIAssistant');
   if (!isAIFeatureEnabled || !isAssistantFlagEnabled) {
-    return {};
+    return {
+      getIsAssistantEnabled: () => false,
+    };
   }
 
   const {
@@ -103,15 +107,37 @@ export function useAssistantActions(): AssistantActionsType {
     interpretExplainPlan,
     interpretConnectionError,
     tellMoreAboutInsight,
+    getIsAssistantEnabled: () => true,
   };
 }
 
-export const compassAssistantServiceLocator = createServiceLocator(function () {
+export const compassAssistantServiceLocator = createServiceLocator(() => {
   const actions = useAssistantActions();
-  return actions;
+
+  const interpretConnectionErrorRef = useRef(actions.interpretConnectionError);
+  interpretConnectionErrorRef.current = actions.interpretConnectionError;
+
+  const getIsAssistantEnabledRef = useRef(actions.getIsAssistantEnabled);
+  getIsAssistantEnabledRef.current = actions.getIsAssistantEnabled;
+
+  return {
+    interpretConnectionError: (options: {
+      connectionInfo: ConnectionInfo;
+      error: Error;
+    }) => interpretConnectionErrorRef.current?.(options),
+    getIsAssistantEnabled: () => {
+      return getIsAssistantEnabledRef.current();
+    },
+  };
 }, 'compassAssistantLocator');
 
-export type CompassAssistantService = AssistantActionsType;
+export type CompassAssistantService = {
+  interpretConnectionError: (options: {
+    connectionInfo: ConnectionInfo;
+    error: Error;
+  }) => void;
+  getIsAssistantEnabled: () => boolean;
+};
 
 export const AssistantProvider: React.FunctionComponent<
   PropsWithChildren<{
@@ -121,6 +147,7 @@ export const AssistantProvider: React.FunctionComponent<
 > = ({ chat, atlasAiService, children }) => {
   const { openDrawer } = useDrawerActions();
   const track = useTelemetry();
+
   const createEntryPointHandler = useRef(function <T>(
     entryPointName:
       | 'explain plan'

packages/compass-connections/src/stores/connections-store-redux.ts

@@ -1284,9 +1284,9 @@ const connectionAttemptError = (
           }
         : undefined,
       onDebugClick:
-        compassAssistant.interpretConnectionError && connectionInfo
+        compassAssistant.getIsAssistantEnabled() && connectionInfo
           ? () => {
-              compassAssistant.interpretConnectionError?.({
+              compassAssistant.interpretConnectionError({
                 connectionInfo,
                 error: err,
               });