refactor and fix

Author: Will-ShaoHua

packages/core/src/codewhisperer/region/regionProfileManager.ts

@@ -49,10 +49,15 @@ const endpoints = createConstantMap({
  */
 export type ProfileSwitchIntent = 'user' | 'auth' | 'update' | 'reload' | 'customization'
 
+export type ProfileChangedEvent = {
+    profile: RegionProfile | undefined
+    intent: ProfileSwitchIntent
+}
+
 export class RegionProfileManager {
     private static logger = getLogger()
     private _activeRegionProfile: RegionProfile | undefined
-    private _onDidChangeRegionProfile = new vscode.EventEmitter<RegionProfile | undefined>()
+    private _onDidChangeRegionProfile = new vscode.EventEmitter<ProfileChangedEvent>()
     public readonly onDidChangeRegionProfile = this._onDidChangeRegionProfile.event
 
     // Store the last API results (for UI propuse) so we don't need to call service again if doesn't require "latest" result
@@ -205,13 +210,16 @@ export class RegionProfileManager {
             })
         }
 
-        await this._switchRegionProfile(regionProfile)
+        await this._switchRegionProfile(regionProfile, source)
     }
 
-    private async _switchRegionProfile(regionProfile: RegionProfile | undefined) {
+    private async _switchRegionProfile(regionProfile: RegionProfile | undefined, source: ProfileSwitchIntent) {
         this._activeRegionProfile = regionProfile
 
-        this._onDidChangeRegionProfile.fire(regionProfile)
+        this._onDidChangeRegionProfile.fire({
+            profile: regionProfile,
+            intent: source,
+        })
         // dont show if it's a default (fallback)
         if (regionProfile && this.profiles.length > 1) {
             void vscode.window.showInformationMessage(`You are using the ${regionProfile.name} profile for Q.`).then()

packages/core/src/codewhisperer/util/customizationUtil.ts

@@ -19,6 +19,7 @@ import { Commands } from '../../shared/vscode/commands2'
 import { RegionProfile, vsCodeState } from '../models/model'
 import { pageableToCollection } from '../../shared/utilities/collectionUtils'
 import { isAwsError } from '../../shared/errors'
+import { ProfileChangedEvent } from '../region/regionProfileManager'
 
 export class CustomizationProvider {
     constructor(
@@ -50,10 +51,13 @@ export class CustomizationProvider {
     }
 }
 
-export const onProfileChangedListener: (profile: RegionProfile | undefined) => any = async (myProfile) => {
+export const onProfileChangedListener: (event: ProfileChangedEvent) => any = async (event) => {
+    if (event.intent === 'customization') {
+        return
+    }
     const logger = getLogger()
     // TODO: To check how do we do we handle it when user signs out.
-    if (!myProfile) {
+    if (!event.profile) {
         await setSelectedCustomization(baseCustomization)
         return
     }
@@ -62,13 +66,13 @@ export const onProfileChangedListener: (profile: RegionProfile | undefined) => a
     const selectedCustomization = getSelectedCustomization()
     // No need to validate base customization which has empty arn.
     if (selectedCustomization.arn.length > 0) {
-        const customizationProvider = await CustomizationProvider.init(myProfile)
+        const customizationProvider = await CustomizationProvider.init(event.profile)
         const customizations = await customizationProvider.listAvailableCustomizations()
 
         const r = customizations.find((it) => it.arn === selectedCustomization.arn)
         if (!r) {
             logger.debug(
-                `profile ${myProfile.name} doesnt have access to customization ${selectedCustomization.name} but has access to ${customizations.map((it) => it.name)}`
+                `profile ${event.profile.name} doesnt have access to customization ${selectedCustomization.name} but has access to ${customizations.map((it) => it.name)}`
             )
             await switchToBaseCustomizationAndNotify()
         }