fix: regions menu has duplicate "recently used" labels #3715

Hweinstock · web-flow · commit e46935139e09 · 2023-08-09T16:26:04.000-07:00
diff --git a/.changes/next-release/Bug Fix-f600d289-1c01-41c5-aff0-00619956aed1.json b/.changes/next-release/Bug Fix-f600d289-1c01-41c5-aff0-00619956aed1.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Regions quickpick menu shows duplicate \"recently used\" labels"
+}
diff --git a/src/shared/ui/common/region.ts b/src/shared/ui/common/region.ts
@@ -45,8 +45,8 @@ export function createRegionPrompter(
 
     const defaultRegionItem = items.find(item => item.detail === defaultRegion)
 
-    if (defaultRegionItem !== undefined) {
-        defaultRegionItem.description = localize('AWS.generic.recentlyUsed', '(recently used)')
+    if (defaultRegionItem !== undefined && !defaultRegionItem.recentlyUsed) {
+        defaultRegionItem.description = localize('AWS.generic.defaultRegion', '(default region)')
     }
 
     const prompter = createQuickPick(items, {
diff --git a/src/shared/ui/common/regionSubmenu.ts b/src/shared/ui/common/regionSubmenu.ts
@@ -46,7 +46,7 @@ export class RegionSubmenu<T> extends Prompter<RegionSubmenuResponse<T>> {
                 data: undefined,
             },
             {
-                label: 'Switch region',
+                label: 'Switch Region',
                 data: switchRegion,
                 description: `current region: ${this.currentRegion}`,
             },
diff --git a/src/test/shared/ui/prompters/regionSubmenu.test.ts b/src/test/shared/ui/prompters/regionSubmenu.test.ts
@@ -45,7 +45,7 @@ describe('regionSubmenu', function () {
         const dataPrompterTester = createQuickPickPrompterTester(
             submenuPrompter.activePrompter as Combine<typeof submenuPrompter.activePrompter>
         )
-        dataPrompterTester.acceptItem('Switch region')
+        dataPrompterTester.acceptItem('Switch Region')
         await dataPrompterTester.result()
 
         const regionTester = createQuickPickPrompterTester(

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Regions quickpick menu shows duplicate \"recently used\" labels"
 +}
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ export function createRegionPrompter(`
`45`	`45`
`46`	`46`	`const defaultRegionItem = items.find(item => item.detail === defaultRegion)`
`47`	`47`
`48`		`- if (defaultRegionItem !== undefined) {`
`49`		`- defaultRegionItem.description = localize('AWS.generic.recentlyUsed', '(recently used)')`
	`48`	`+ if (defaultRegionItem !== undefined && !defaultRegionItem.recentlyUsed) {`
	`49`	`+ defaultRegionItem.description = localize('AWS.generic.defaultRegion', '(default region)')`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`const prompter = createQuickPick(items, {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class RegionSubmenu<T> extends Prompter<RegionSubmenuResponse<T>> {`
`46`	`46`	`data: undefined,`
`47`	`47`	`},`
`48`	`48`	`{`
`49`		`- label: 'Switch region',`
	`49`	`+ label: 'Switch Region',`
`50`	`50`	`data: switchRegion,`
`51`	`51`	description: `current region: ${this.currentRegion}`,
`52`	`52`	`},`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ describe('regionSubmenu', function () {`
`45`	`45`	`const dataPrompterTester = createQuickPickPrompterTester(`
`46`	`46`	`submenuPrompter.activePrompter as Combine<typeof submenuPrompter.activePrompter>`
`47`	`47`	`)`
`48`		`- dataPrompterTester.acceptItem('Switch region')`
	`48`	`+ dataPrompterTester.acceptItem('Switch Region')`
`49`	`49`	`await dataPrompterTester.result()`
`50`	`50`
`51`	`51`	`const regionTester = createQuickPickPrompterTester(`