mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Introduce Tenant hierarchy in Azure resource tree for multi-tenant accounts (#23311)
This commit is contained in:
@@ -136,15 +136,15 @@
|
||||
{
|
||||
"id": "microsoft",
|
||||
"icon": {
|
||||
"light": "./resources/light/microsoft_account_light.svg",
|
||||
"dark": "./resources/dark/microsoft_account_dark.svg"
|
||||
"light": "./resources/users.svg",
|
||||
"dark": "./resources/users.svg"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "work_school",
|
||||
"icon": {
|
||||
"light": "./resources/light/work_school_account_light.svg",
|
||||
"dark": "./resources/dark/work_school_account_dark.svg"
|
||||
"light": "./resources/users.svg",
|
||||
"dark": "./resources/users.svg"
|
||||
}
|
||||
}
|
||||
],
|
||||
@@ -174,6 +174,11 @@
|
||||
"title": "%azure.resource.refresh.title%",
|
||||
"icon": "$(refresh)"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selecttenants",
|
||||
"title": "%azure.resource.selecttenants.title%",
|
||||
"icon": "$(filter)"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selectsubscriptions",
|
||||
"title": "%azure.resource.selectsubscriptions.title%",
|
||||
@@ -237,6 +242,10 @@
|
||||
"command": "azure.resource.selectsubscriptions",
|
||||
"when": "false"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selecttenants",
|
||||
"when": "false"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.azureview.refresh",
|
||||
"when": "false"
|
||||
@@ -267,24 +276,44 @@
|
||||
}
|
||||
],
|
||||
"view/item/context": [
|
||||
{
|
||||
"command": "azure.resource.selecttenants",
|
||||
"when": "viewItem == azure.resource.itemType.multipleTenantAccount",
|
||||
"group": "inline"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selecttenants",
|
||||
"when": "viewItem == azure.resource.itemType.multipleTenantAccount",
|
||||
"group": "azurecore"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selectsubscriptions",
|
||||
"when": "viewItem == azure.resource.itemType.account",
|
||||
"when": "viewItem == azure.resource.itemType.singleTenantAccount",
|
||||
"group": "inline"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selectsubscriptions",
|
||||
"when": "viewItem == azure.resource.itemType.account",
|
||||
"when": "viewItem == azure.resource.itemType.singleTenantAccount",
|
||||
"group": "azurecore"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selectsubscriptions",
|
||||
"when": "viewItem == azure.resource.itemType.tenant",
|
||||
"group": "inline"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selectsubscriptions",
|
||||
"when": "viewItem == azure.resource.itemType.tenant",
|
||||
"group": "azurecore"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.azureview.refresh",
|
||||
"when": "viewItem =~ /^azure\\.resource\\.itemType\\.(?:account|subscription|databaseContainer|databaseServerContainer|synapseSqlPoolContainer|synapseWorkspaceContainer)$/",
|
||||
"when": "viewItem =~ /^azure\\.resource\\.itemType\\.(?:singleTenantAccount|multipleTenantAccount|subscription|tenant|databaseContainer|databaseServerContainer|synapseSqlPoolContainer|synapseWorkspaceContainer)$/",
|
||||
"group": "inline"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.azureview.refresh",
|
||||
"when": "viewItem =~ /^azure\\.resource\\.itemType\\.(?:account|subscription|databaseContainer|databaseServerContainer|synapseSqlPoolContainer|synapseWorkspaceContainer)$/",
|
||||
"when": "viewItem =~ /^azure\\.resource\\.itemType\\.(?:singleTenantAccount|multipleTenantAccount|subscription|tenant|databaseContainer|databaseServerContainer|synapseSqlPoolContainer|synapseWorkspaceContainer)$/",
|
||||
"group": "azurecore"
|
||||
},
|
||||
{
|
||||
@@ -299,7 +328,7 @@
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.startterminal",
|
||||
"when": "viewItem == azure.resource.itemType.account",
|
||||
"when": "viewItem =~ /^azure\\.resource\\.itemType\\.(?:singleTenantAccount|multipleTenantAccount)$/",
|
||||
"group": "inline"
|
||||
},
|
||||
{
|
||||
@@ -314,19 +343,29 @@
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.startterminal",
|
||||
"when": "viewItem == azure.resource.itemType.account",
|
||||
"when": "viewItem =~ /^azure\\.resource\\.itemType\\.(?:singleTenantAccount|multipleTenantAccount)$/",
|
||||
"group": "azurecore"
|
||||
}
|
||||
],
|
||||
"connectionDialog/browseTree": [
|
||||
{
|
||||
"command": "azure.resource.selectsubscriptions",
|
||||
"when": "contextValue == azure.resource.itemType.account",
|
||||
"when": "contextValue == azure.resource.itemType.tenant",
|
||||
"group": "navigation"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selecttenants",
|
||||
"when": "contextValue == azure.resource.itemType.multipleTenantAccount",
|
||||
"group": "navigation"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.selectsubscriptions",
|
||||
"when": "contextValue == azure.resource.itemType.singleTenantAccount",
|
||||
"group": "navigation"
|
||||
},
|
||||
{
|
||||
"command": "azure.resource.connectiondialog.refresh",
|
||||
"when": "contextValue == azure.resource.itemType.account",
|
||||
"when": "contextValue =~ /^azure\\.resource\\.itemType\\.(?:singleTenantAccount|multipleTenantAccount|tenant)$/",
|
||||
"group": "navigation"
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user