refactor(notifications): remove unneeded InstalledExtensions criteria

We have both ActiveExtensions (checks what extensions are installed and active), and InstalledExtensions (just what extensions are installed).
This removes InstalledExtensions because most of the intention behind it is captured by ActiveExtensions. When would we only care about whats installed but not active?

Removing a criteria decreases complexity and confusion in both code and for those drafting notifications, so this is an easy removal.

Author: hayemaxi

packages/core/src/notifications/rules.ts

@@ -134,8 +134,6 @@ export class RuleEngine {
                 return hasAnyOfExpected(this.context.authStates)
             case 'AuthScopes':
                 return isEqualSetToExpected(this.context.authScopes)
-            case 'InstalledExtensions':
-                return isSuperSetOfExpected(this.context.installedExtensions)
             case 'ActiveExtensions':
                 return isSuperSetOfExpected(this.context.activeExtensions)
             default:
@@ -169,15 +167,15 @@ export async function getRuleContext(context: vscode.ExtensionContext, authState
         computeEnv: await getComputeEnvType(),
         authTypes: [...new Set(authTypes)],
         authScopes: authState.authScopes ? authState.authScopes?.split(',') : [],
-        installedExtensions: vscode.extensions.all.map((e) => e.id),
         activeExtensions: vscode.extensions.all.filter((e) => e.isActive).map((e) => e.id),
 
         // Toolkit (and eventually Q?) may have multiple connections with different regions and states.
         // However, this granularity does not seem useful at this time- only the active connection is considered.
         authRegions: authState.awsRegion ? [authState.awsRegion] : [],
         authStates: [authState.authStatus],
     }
-    const { activeExtensions, installedExtensions, ...loggableRuleContext } = ruleContext
+
+    const { activeExtensions, ...loggableRuleContext } = ruleContext
     getLogger('notifications').debug('getRuleContext() determined rule context: %O', loggableRuleContext)
 
     return ruleContext

packages/core/src/notifications/types.ts

@@ -9,15 +9,7 @@ import { TypeConstructor } from '../shared/utilities/typeConstructors'
 import { AuthUserState, AuthStatus } from '../shared/telemetry/telemetry.gen'
 
 /** Types of information that we can use to determine whether to show a notification or not. */
-export type Criteria =
-    | 'OS'
-    | 'ComputeEnv'
-    | 'AuthType'
-    | 'AuthRegion'
-    | 'AuthState'
-    | 'AuthScopes'
-    | 'InstalledExtensions'
-    | 'ActiveExtensions'
+export type Criteria = 'OS' | 'ComputeEnv' | 'AuthType' | 'AuthRegion' | 'AuthState' | 'AuthScopes' | 'ActiveExtensions'
 
 /** Generic condition where the type determines how the values are evaluated. */
 export interface CriteriaCondition {
@@ -132,7 +124,6 @@ export interface RuleContext {
     readonly authRegions: string[]
     readonly authStates: AuthStatus[]
     readonly authScopes: string[]
-    readonly installedExtensions: string[]
     readonly activeExtensions: string[]
 }
 

packages/core/src/test/notifications/controller.test.ts

@@ -39,7 +39,6 @@ describe('Notifications Controller', function () {
         authRegions: ['us-east-1'],
         authStates: ['connected'],
         authScopes: ['codewhisperer:completions', 'codewhisperer:analysis'],
-        installedExtensions: ['ext1', 'ext2', 'ext3'],
         activeExtensions: ['ext1', 'ext2'],
     })
 

packages/core/src/test/notifications/rules.test.ts

@@ -24,7 +24,6 @@ describe('Notifications Rule Engine', function () {
         authRegions: ['us-east-1'],
         authStates: ['connected'],
         authScopes: ['codewhisperer:completions', 'codewhisperer:analysis'],
-        installedExtensions: ['ext1', 'ext2', 'ext3'],
         activeExtensions: ['ext1', 'ext2'],
     }
 
@@ -405,28 +404,6 @@ describe('Notifications Rule Engine', function () {
         )
     })
 
-    it('should display notification for InstalledExtensions criteria', function () {
-        assert.equal(
-            ruleEngine.shouldDisplayNotification(
-                buildNotification({
-                    additionalCriteria: [{ type: 'InstalledExtensions', values: ['ext1', 'ext2'] }],
-                })
-            ),
-            true
-        )
-    })
-
-    it('should NOT display notification for invalid InstalledExtensions criteria', function () {
-        assert.equal(
-            ruleEngine.shouldDisplayNotification(
-                buildNotification({
-                    additionalCriteria: [{ type: 'InstalledExtensions', values: ['ext1', 'ext2', 'unknownExtension'] }],
-                })
-            ),
-            false
-        )
-    })
-
     it('should display notification for ActiveExtensions criteria', function () {
         assert.equal(
             ruleEngine.shouldDisplayNotification(
@@ -479,7 +456,6 @@ describe('Notifications Rule Engine', function () {
                         { type: 'AuthRegion', values: ['us-east-1', 'us-west-2'] },
                         { type: 'AuthState', values: ['connected'] },
                         { type: 'AuthScopes', values: ['codewhisperer:completions', 'codewhisperer:analysis'] },
-                        { type: 'InstalledExtensions', values: ['ext1', 'ext2'] },
                         { type: 'ActiveExtensions', values: ['ext1', 'ext2'] },
                     ],
                 })
@@ -517,7 +493,6 @@ describe('Notifications Rule Engine', function () {
                         { type: 'AuthRegion', values: ['us-east-1', 'us-west-2'] },
                         { type: 'AuthState', values: ['connected'] },
                         { type: 'AuthScopes', values: ['codewhisperer:completions', 'codewhisperer:analysis'] },
-                        { type: 'InstalledExtensions', values: ['ex1', 'ext2'] },
                         { type: 'ActiveExtensions', values: ['ext1', 'ext2'] },
 
                         { type: 'ComputeEnv', values: ['ec2'] }, // no 'local'
@@ -576,7 +551,6 @@ describe('Notifications getRuleContext()', function () {
             authRegions: ['us-east-1'],
             authStates: ['connected'],
             authScopes: amazonQScopes,
-            installedExtensions: vscode.extensions.all.map((e) => e.id),
             activeExtensions: vscode.extensions.all.filter((e) => e.isActive).map((e) => e.id),
         })
     })