From ac2e2a6f8ed32edc8df0c1bf411d741fe96f594d Mon Sep 17 00:00:00 2001 From: sindhuba <122321535+sindhuba@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:41:58 -0700 Subject: [PATCH] Add tenantId info in Data Explorer while opening from Portal (#1987) * Fix API endpoint for CassandraProxy query API * activate Mongo Proxy and Cassandra Proxy in Prod * Add CP Prod endpoint * Run npm format and tests * Revert code * fix bug that blocked local mongo proxy and cassandra proxy development * Add prod endpoint * fix pr check tests * Remove prod * Remove prod endpoint * Remove dev endpoint * Support data plane RBAC * Support data plane RBAC * Add additional changes for Portal RBAC functionality * Remove unnecessary code * Remove unnecessary code * Add code to fix VCoreMongo/PG bug * Address feedback * Add more logs for RBAC feature * Add more logs for RBAC features * Add AAD endpoints for all environments * Add AAD endpoints * Run npm format * Support multi-tenant switching for Data plane RBAC * Run npm format --------- Co-authored-by: Asier Isayas --- src/Contracts/ViewModels.ts | 1 + src/UserContext.ts | 1 + src/hooks/useKnockoutExplorer.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Contracts/ViewModels.ts b/src/Contracts/ViewModels.ts index 767665686..f8c6d885c 100644 --- a/src/Contracts/ViewModels.ts +++ b/src/Contracts/ViewModels.ts @@ -381,6 +381,7 @@ export enum TerminalKind { export interface DataExplorerInputsFrame { databaseAccount: any; subscriptionId?: string; + tenantId?: string; resourceGroup?: string; masterKey?: string; hasWriteAccess?: boolean; diff --git a/src/UserContext.ts b/src/UserContext.ts index ac534029a..f4b43a2f3 100644 --- a/src/UserContext.ts +++ b/src/UserContext.ts @@ -74,6 +74,7 @@ export interface UserContext { readonly authType?: AuthType; readonly masterKey?: string; readonly subscriptionId?: string; + readonly tenantId?: string; readonly resourceGroup?: string; readonly databaseAccount?: DatabaseAccount; readonly endpoint?: string; diff --git a/src/hooks/useKnockoutExplorer.ts b/src/hooks/useKnockoutExplorer.ts index 590b9195b..f86e380a1 100644 --- a/src/hooks/useKnockoutExplorer.ts +++ b/src/hooks/useKnockoutExplorer.ts @@ -693,6 +693,7 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) { databaseAccount, resourceGroup: inputs.resourceGroup, subscriptionId: inputs.subscriptionId, + tenantId: inputs.tenantId, subscriptionType: inputs.subscriptionType, quotaId: inputs.quotaId, portalEnv: inputs.serverId as PortalEnv,