From 92a56f77b7bcd8f98e92c701bf5986966f821702 Mon Sep 17 00:00:00 2001 From: vchske Date: Wed, 20 May 2026 09:59:59 -0700 Subject: [PATCH] Adding temporary console logging to track down issue (#2492) * Adding temporary console logging to track down issue * Temporarily removing lint rule and made formatting changes --- .eslintrc.js | 2 +- src/Common/ErrorHandlingUtils.ts | 1 + src/Common/dataAccess/readDatabases.ts | 50 ++++++++++++------- src/Explorer/Explorer.tsx | 11 ++++ .../generatedClients/cosmos/sqlResources.ts | 11 +++- 5 files changed, 55 insertions(+), 20 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index fb1ed3a73..69a8eefe7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -40,7 +40,7 @@ module.exports = { }, ], rules: { - "no-console": ["error", { allow: ["error", "warn", "dir"] }], + //CTODO temp removing this: "no-console": ["error", { allow: ["error", "warn", "dir"] }], curly: "error", "@typescript-eslint/switch-exhaustiveness-check": "error", "@typescript-eslint/no-unused-vars": "error", diff --git a/src/Common/ErrorHandlingUtils.ts b/src/Common/ErrorHandlingUtils.ts index f96780065..9713f3a47 100644 --- a/src/Common/ErrorHandlingUtils.ts +++ b/src/Common/ErrorHandlingUtils.ts @@ -20,6 +20,7 @@ export const handleError = ( consoleErrorPrefix?: string, options?: HandleErrorOptions, ): void => { + console.log("{{cdbp}} in handleError(): raw error: " + JSON.stringify(error)); //CTODO in case a stray error happens const errorMessage = getErrorMessage(error); const errorCode = error instanceof ARMError ? error.code : undefined; diff --git a/src/Common/dataAccess/readDatabases.ts b/src/Common/dataAccess/readDatabases.ts index e9f43e65f..768526443 100644 --- a/src/Common/dataAccess/readDatabases.ts +++ b/src/Common/dataAccess/readDatabases.ts @@ -26,6 +26,7 @@ export async function readDatabases(): Promise { (userContext.fabricContext?.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY]).resourceTokenInfo .resourceTokens ) { + console.log("{{cdbp}} in readDatabases(): isFabricMirroredKey && has resourceTokens"); //CTODO should not get here const tokensData = (userContext.fabricContext.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY]) .resourceTokenInfo; @@ -59,6 +60,7 @@ export async function readDatabases(): Promise { clearMessage(); return databases; } else if (isFabricNative() && userContext.fabricContext?.databaseName) { + console.log("{{cdbp}} in readDatabases(): isFabricNative"); //CTODO should not get here const databaseId = userContext.fabricContext.databaseName; databases = [ { @@ -81,9 +83,15 @@ export async function readDatabases(): Promise { userContext.apiType !== "Tables" && !isFabric() ) { + console.log("{{cdbp}} in readDatabases(): authType == AAD, enableSDKOperations, apiType != Tables, !isFabric"); + console.log("{{cdbp}} in readDatabases(): databaseaccount: " + userContext.databaseAccount); + console.log("{{cdbp}} in readDatabases(): calling readDatabasesWithARM"); databases = await readDatabasesWithARM(); + console.log("{{cdbp}} in readDatabases(): done readDatabasesWithARM"); } else { + console.log("{{cdbp}} in readDatabases(): calling SDK"); const sdkResponse = await client().databases.readAll().fetchAll(); + console.log("{{cdbp}} in readDatabases(): done SDK"); databases = sdkResponse.resources as DataModels.Database[]; } } catch (error) { @@ -108,22 +116,30 @@ export async function readDatabasesWithARM(accountOverride?: { const accountName = accountOverride?.accountName ?? userContext?.databaseAccount?.name ?? ""; const apiType = accountOverride?.apiType ?? userContext.apiType; - switch (apiType) { - case "SQL": - rpResponse = await listSqlDatabases(subscriptionId, resourceGroup, accountName); - break; - case "Mongo": - rpResponse = await listMongoDBDatabases(subscriptionId, resourceGroup, accountName); - break; - case "Cassandra": - rpResponse = await listCassandraKeyspaces(subscriptionId, resourceGroup, accountName); - break; - case "Gremlin": - rpResponse = await listGremlinDatabases(subscriptionId, resourceGroup, accountName); - break; - default: - throw new Error(`Unsupported default experience type: ${apiType}`); - } + try { + switch (apiType) { + case "SQL": + console.log("{{cdbp}} in readDatabasesWithARM(): calling listSqlDatabases"); + rpResponse = await listSqlDatabases(subscriptionId, resourceGroup, accountName); + console.log("{{cdbp}} in readDatabasesWithARM(): done listSqlDatabases"); + break; + case "Mongo": + rpResponse = await listMongoDBDatabases(subscriptionId, resourceGroup, accountName); + break; + case "Cassandra": + rpResponse = await listCassandraKeyspaces(subscriptionId, resourceGroup, accountName); + break; + case "Gremlin": + rpResponse = await listGremlinDatabases(subscriptionId, resourceGroup, accountName); + break; + default: + throw new Error(`Unsupported default experience type: ${apiType}`); + } - return rpResponse?.value?.map((database) => database.properties?.resource as DataModels.Database) ?? []; + console.log("{{cdbp}} in readDatabasesWithARM(): response: " + JSON.stringify(rpResponse)); + return rpResponse?.value?.map((database) => database.properties?.resource as DataModels.Database) ?? []; + } catch (error) { + console.log("{{cdbp}} in readDatabasesWithARM(): ERROR: " + JSON.stringify(error)); + throw error; + } } diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx index d7a03f380..17c55d557 100644 --- a/src/Explorer/Explorer.tsx +++ b/src/Explorer/Explorer.tsx @@ -405,19 +405,27 @@ export default class Explorer { }, startKey, ); + console.log("{{cdbp}} in refreshAllDatabases(): done readDatabases"); const currentDatabases = useDatabases.getState().databases; + console.log("{{cdbp}} in refreshAllDatabases(): currentDatabases: " + currentDatabases); const deltaDatabases = this.getDeltaDatabases(databases, currentDatabases); + console.log("{{cdbp}} in refreshAllDatabases(): deltaDatabases: " + deltaDatabases); let updatedDatabases = currentDatabases.filter( (database) => !deltaDatabases.toDelete.some((deletedDatabase) => deletedDatabase.id() === database.id()), ); + console.log("{{cdbp}} in refreshAllDatabases(): updatedDatabases after filter: " + updatedDatabases); updatedDatabases = [...updatedDatabases, ...deltaDatabases.toAdd].sort((db1, db2) => db1.id().localeCompare(db2.id()), ); + console.log("{{cdbp}} in refreshAllDatabases(): updatedDatabases after sort: " + updatedDatabases); useDatabases.setState({ databases: updatedDatabases, databasesFetchedSuccessfully: true }); scenarioMonitor.completePhase(MetricScenario.DatabaseLoad, ApplicationMetricPhase.DatabasesFetched); + console.log("{{cdbp}} in refreshAllDatabases(): calling refreshAndExpandNewDatabases"); await this.refreshAndExpandNewDatabases(deltaDatabases.toAdd, updatedDatabases); + console.log("{{cdbp}} in refreshAllDatabases(): done refreshAndExpandNewDatabases"); } catch (error) { + console.log("{{cdbp}} in refreshAllDatabases(): ERROR: " + JSON.stringify(error)); //CTODO this should be logged already but just in case const errorMessage = getErrorMessage(error); TelemetryProcessor.traceFailure( Action.LoadDatabases, @@ -607,6 +615,7 @@ export default class Explorer { ? databases : databases.filter((db) => db.isDatabaseExpanded() || db.id() === Constants.SavedQueries.DatabaseName); + console.log("{{cdbp}} in refreshAndExpandNewDatabases(): databasesToLoad: " + databasesToLoad); const startKey: number = TelemetryProcessor.traceStart(Action.LoadCollections, { dataExplorerArea: Constants.Areas.ResourceTree, }); @@ -615,6 +624,7 @@ export default class Explorer { try { await Promise.all( databasesToLoad.map(async (database: ViewModels.Database) => { + console.log("{{cdbp}} in refreshAndExpandNewDatabases(): loadCollections for database: " + database.id); await database.loadCollections(true); const isNewDatabase: boolean = _.some(newDatabases, (db: ViewModels.Database) => db.id() === database.id()); if (isNewDatabase) { @@ -634,6 +644,7 @@ export default class Explorer { // Start DatabaseTreeRendered — React render cycle will complete it in ResourceTree scenarioMonitor.startPhase(MetricScenario.DatabaseLoad, ApplicationMetricPhase.DatabaseTreeRendered); } catch (error) { + console.log("{{cdbp}} in refreshAndExpandNewDatabases(): ERROR: " + JSON.stringify(error)); //CTODO this should be logged already but just in case TelemetryProcessor.traceFailure( Action.LoadCollections, { diff --git a/src/Utils/arm/generatedClients/cosmos/sqlResources.ts b/src/Utils/arm/generatedClients/cosmos/sqlResources.ts index 608d9a953..60da48d26 100644 --- a/src/Utils/arm/generatedClients/cosmos/sqlResources.ts +++ b/src/Utils/arm/generatedClients/cosmos/sqlResources.ts @@ -6,9 +6,9 @@ Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/DocumentDB/preview/2025-11-01-preview/cosmos-db.json */ +import { configContext } from "../../../../ConfigContext"; import { armRequest } from "../../request"; import * as Types from "./types"; -import { configContext } from "../../../../ConfigContext"; const apiVersion = "2025-11-01-preview"; /* Lists the SQL databases under an existing Azure Cosmos DB database account. */ @@ -18,7 +18,14 @@ export async function listSqlDatabases( accountName: string, ): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/sqlDatabases`; - return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion }); + console.log("{{cdbp}} in listSqlDatabases(): path: " + path); + try { + console.log("{{cdbp}} in listSqlDatabases(): calling armRequest"); + return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion }); + } catch (error) { + console.log("{{cdbp}} in listSqlDatabases(): ERROR: " + JSON.stringify(error)); + throw error; + } } /* Gets the SQL database under an existing Azure Cosmos DB database account with the provided name. */