44 */
55
66import * as vscode from 'vscode'
7- import { AwsContext } from '../shared/awsContext '
7+ import { Auth , AuthNode , useIamCredentials } from '../credentials/auth '
88import { getIdeProperties } from '../shared/extensionUtilities'
9+ import { getIcon } from '../shared/icons'
910import { getLogger , Logger } from '../shared/logger'
1011import { RegionProvider } from '../shared/regions/regionProvider'
1112import { RefreshableAwsTreeProvider } from '../shared/treeview/awsTreeProvider'
1213import { AWSCommandTreeNode } from '../shared/treeview/nodes/awsCommandTreeNode'
1314import { AWSTreeNodeBase } from '../shared/treeview/nodes/awsTreeNodeBase'
14- import { makeChildrenNodes } from '../shared/treeview/utils'
15+ import { makeChildrenNodes , TreeShim } from '../shared/treeview/utils'
1516import { intersection , toMap , updateInPlace } from '../shared/utilities/collectionUtils'
17+ import { once } from '../shared/utilities/functionUtils'
1618import { localize } from '../shared/utilities/vsCodeUtils'
1719import { RegionNode } from './regionNode'
1820
@@ -23,14 +25,6 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
2325 private readonly _onDidChangeTreeData : vscode . EventEmitter < AWSTreeNodeBase | undefined >
2426 private readonly regionNodes : Map < string , RegionNode >
2527
26- private readonly ROOT_NODE_SIGN_IN = new AWSCommandTreeNode (
27- undefined ,
28- localize ( 'AWS.explorerNode.connecting.label' , 'Connecting...' ) ,
29- 'aws.login' ,
30- undefined ,
31- localize ( 'AWS.explorerNode.connecting.tooltip' , 'Connecting...' )
32- )
33-
3428 private readonly ROOT_NODE_ADD_REGION = new AWSCommandTreeNode (
3529 undefined ,
3630 localize ( 'AWS.explorerNode.addRegion' , 'Add regions to {0} Explorer...' , getIdeProperties ( ) . company ) ,
@@ -45,33 +39,19 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
4539
4640 public constructor (
4741 private readonly extContext : vscode . ExtensionContext ,
48- private readonly awsContext : AwsContext ,
49- private readonly regionProvider : RegionProvider
42+ private readonly regionProvider : RegionProvider ,
43+ private readonly auth = Auth . instance
5044 ) {
5145 this . _onDidChangeTreeData = new vscode . EventEmitter < AWSTreeNodeBase | undefined > ( )
5246 this . onDidChangeTreeData = this . _onDidChangeTreeData . event
5347 this . regionNodes = new Map < string , RegionNode > ( )
54- this . extContext . subscriptions . push (
55- this . awsContext . onDidChangeContext ( e => {
56- if ( ! e . accountId ) {
57- this . ROOT_NODE_SIGN_IN . label = localize (
58- 'AWS.explorerNode.signIn' ,
59- 'Connect to {0}...' ,
60- getIdeProperties ( ) . company
61- )
62- this . ROOT_NODE_SIGN_IN . tooltip = localize (
63- 'AWS.explorerNode.signIn.tooltip' ,
64- 'Click here to select credentials for the {0} Toolkit' ,
65- getIdeProperties ( ) . company
66- )
67- }
68- } )
69- )
48+
7049 this . extContext . subscriptions . push (
7150 this . regionProvider . onDidChange ( ( ) => {
7251 this . logger . verbose ( 'Refreshing AWS Explorer due to Region Provider updates' )
7352 this . refresh ( )
74- } )
53+ } ) ,
54+ this . auth . onDidChangeActiveConnection ( ( ) => this . refresh ( ) )
7555 )
7656 }
7757
@@ -120,28 +100,42 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
120100 this . _onDidChangeTreeData . fire ( node )
121101 }
122102
103+ private readonly getAuthNode = once ( ( ) => new TreeShim ( new AuthNode ( this . auth ) ) )
123104 private async getRootNodes ( ) : Promise < AWSTreeNodeBase [ ] > {
124- if ( ! ( await this . awsContext . getCredentials ( ) ) ) {
125- return [ this . ROOT_NODE_SIGN_IN ]
105+ const conn = this . auth . activeConnection
106+ if ( conn !== undefined && conn . type !== 'iam' ) {
107+ // TODO: this should show up as a child node?
108+ const selectIamNode = useIamCredentials . build ( this . auth ) . asTreeNode ( {
109+ // label: `No IAM credentials linked to ${conn.label}`,
110+ // iconPath: getIcon('vscode-circle-slash'),
111+ label : 'Select IAM Credentials to View Resources' ,
112+ iconPath : getIcon ( 'vscode-sync' ) ,
113+ } )
114+
115+ return [ this . getAuthNode ( ) , new TreeShim ( selectIamNode ) ]
116+ } else if ( conn === undefined || conn . state !== 'valid' ) {
117+ return [ this . getAuthNode ( ) ]
126118 }
127119
128120 const partitionRegions = this . regionProvider . getRegions ( )
129121 const userVisibleRegionCodes = this . regionProvider . getExplorerRegions ( )
130122 const regionMap = toMap ( partitionRegions , r => r . id )
131123
132- return await makeChildrenNodes ( {
133- getChildNodes : async ( ) => {
134- updateInPlace (
135- this . regionNodes ,
136- intersection ( regionMap . keys ( ) , userVisibleRegionCodes ) ,
137- key => this . regionNodes . get ( key ) ! . update ( regionMap . get ( key ) ! ) ,
138- key => new RegionNode ( regionMap . get ( key ) ! , this . regionProvider )
139- )
124+ updateInPlace (
125+ this . regionNodes ,
126+ intersection ( regionMap . keys ( ) , userVisibleRegionCodes ) ,
127+ key => this . regionNodes . get ( key ) ! . update ( regionMap . get ( key ) ! ) ,
128+ key => new RegionNode ( regionMap . get ( key ) ! , this . regionProvider )
129+ )
130+
131+ if ( this . regionNodes . size === 0 ) {
132+ return [ this . getAuthNode ( ) , this . ROOT_NODE_ADD_REGION ]
133+ }
140134
141- return [ ... this . regionNodes . values ( ) ]
142- } ,
143- getNoChildrenPlaceholderNode : async ( ) => this . ROOT_NODE_ADD_REGION ,
144- sort : ( nodeA , nodeB ) => nodeA . regionName . localeCompare ( nodeB . regionName ) ,
135+ return await makeChildrenNodes ( {
136+ getChildNodes : async ( ) => [ this . getAuthNode ( ) , ... this . regionNodes . values ( ) ] ,
137+ sort : ( a , b ) =>
138+ a instanceof TreeShim ? - 1 : b instanceof TreeShim ? 1 : a . regionName . localeCompare ( b . regionName ) ,
145139 } )
146140 }
147141}
0 commit comments