[9.4] [Entity Analytics] Fix toggle ignoring V2 store status when V1 experimental flag is disabled (#263918)

x-pack/solutions/security/plugins/security_solution/public/entity_analytics/hooks/use_entity_analytics_status.test.ts

@@ -190,6 +190,17 @@ describe('deriveEntityAnalyticsStatus', () => {
   describe('entity store v2 (entity store is sole status driver)', () => {
     const v2Base = { ...base, isEntityStoreV2Enabled: true };
 
+    it('returns enabled when V2 is enabled and store=running even if V1 feature flag is disabled', () => {
+      expect(
+        deriveEntityAnalyticsStatus({
+          ...v2Base,
+          isEntityStoreFeatureFlagDisabled: true,
+          riskEngineStatus: RiskEngineStatusEnum.NOT_INSTALLED,
+          entityStoreStatus: 'running',
+        })
+      ).toBe('enabled');
+    });
+
     it('returns enabled when store=running regardless of risk engine status', () => {
       expect(
         deriveEntityAnalyticsStatus({

x-pack/solutions/security/plugins/security_solution/public/entity_analytics/hooks/use_entity_analytics_status.ts

@@ -88,6 +88,17 @@ export const deriveEntityAnalyticsStatus = ({
     return 'enabling';
   }
 
+  // V2 supersedes the V1 experimental feature flag — check it first
+  if (isEntityStoreV2Enabled) {
+    if (entityStoreStatus === 'installing') {
+      return 'enabling';
+    }
+    if (entityStoreStatus === 'error') {
+      return 'error';
+    }
+    return deriveEntityStoreOnlyStatus(entityStoreStatus);
+  }
+
   if (isEntityStoreFeatureFlagDisabled) {
     return deriveRiskEngineOnlyStatus(riskEngineStatus);
   }
@@ -100,10 +111,6 @@ export const deriveEntityAnalyticsStatus = ({
     return 'error';
   }
 
-  if (isEntityStoreV2Enabled) {
-    return deriveEntityStoreOnlyStatus(entityStoreStatus);
-  }
-
   return deriveCombinedStatus(riskEngineStatus, entityStoreStatus);
 };
 

x-pack/solutions/security/plugins/security_solution/public/entity_analytics/hooks/use_toggle_entity_analytics.ts

@@ -165,8 +165,9 @@ export const useToggleEntityAnalytics = ({
     setIsToggling(true);
     try {
       const riskOn = riskEngineStatus === RiskEngineStatusEnum.ENABLED;
-      const storeOn =
-        !isEntityStoreFeatureFlagDisabled && entityStoreStatus === StoreStatusEnum.running;
+      const storeOn = isEntityStoreV2Enabled
+        ? entityStoreStatus === StoreStatusEnum.running
+        : !isEntityStoreFeatureFlagDisabled && entityStoreStatus === StoreStatusEnum.running;
 
       if (isEntityStoreV2Enabled) {
         if (storeOn) {