From 0fc10fe6177cb07686988fcef32da9521f00adea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 09:46:43 -0700 Subject: [PATCH 01/11] Bump launch-editor from 2.6.1 to 2.14.1 (#2508) Bumps [launch-editor](https://github.com/vitejs/launch-editor) from 2.6.1 to 2.14.1. - [Commits](https://github.com/vitejs/launch-editor/compare/v2.6.1...v2.14.1) --- updated-dependencies: - dependency-name: launch-editor dependency-version: 2.14.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 385c69c6d..8f66432e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22317,18 +22317,25 @@ "license": "Apache-2.0" }, "node_modules/launch-editor": { - "version": "2.6.1", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.14.1.tgz", + "integrity": "sha512-QWBrQsMpH7gPr965dsKD/3cKWiNoTjpATQf++Xq63N6sKRGMwlVXz41O1IZTMfZQgBctD/K5Zt06+/I6pP6+HA==", "dev": true, "license": "MIT", "dependencies": { - "picocolors": "^1.0.0", - "shell-quote": "^1.8.1" + "picocolors": "^1.1.1", + "shell-quote": "^1.8.4" } }, "node_modules/launch-editor/node_modules/shell-quote": { - "version": "1.8.1", + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz", + "integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==", "dev": true, "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } From 0f385a9058f602413286575a9932990ca9a0e29b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 14:10:46 -0700 Subject: [PATCH 02/11] Bump brace-expansion from 1.1.12 to 1.1.15 (#2507) Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.12 to 1.1.15. - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](https://github.com/juliangruber/brace-expansion/compare/v1.1.12...v1.1.15) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.15 dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8f66432e5..9edd34077 100644 --- a/package-lock.json +++ b/package-lock.json @@ -163,7 +163,7 @@ "@webpack-cli/serve": "2.0.5", "babel-jest": "29.7.0", "babel-loader": "8.1.0", - "brace-expansion": "1.1.12", + "brace-expansion": "1.1.15", "buffer": "5.1.0", "case-sensitive-paths-webpack-plugin": "2.4.0", "create-file-webpack": "1.0.2", @@ -11679,9 +11679,10 @@ } }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", + "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" diff --git a/package.json b/package.json index 19efa3a9b..84299d2cc 100644 --- a/package.json +++ b/package.json @@ -173,7 +173,7 @@ "@webpack-cli/serve": "2.0.5", "babel-jest": "29.7.0", "babel-loader": "8.1.0", - "brace-expansion": "1.1.12", + "brace-expansion": "1.1.15", "buffer": "5.1.0", "case-sensitive-paths-webpack-plugin": "2.4.0", "create-file-webpack": "1.0.2", From a598411c0081ca8ab524726db79f3aae5bd6a445 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2026 13:15:31 -0700 Subject: [PATCH 03/11] Bump qs and express (#2497) Bumps [qs](https://github.com/ljharb/qs) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `qs` from 6.14.1 to 6.15.2 - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.14.1...v6.15.2) Updates `express` from 4.22.1 to 4.22.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/v4.22.2/History.md) - [Commits](https://github.com/expressjs/express/compare/v4.22.1...v4.22.2) --- updated-dependencies: - dependency-name: express dependency-version: 4.22.2 dependency-type: indirect - dependency-name: qs dependency-version: 6.15.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9edd34077..06535b293 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11604,10 +11604,11 @@ } }, "node_modules/body-parser": { - "version": "1.20.4", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", - "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", + "version": "1.20.5", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz", + "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "~3.1.2", "content-type": "~1.0.5", @@ -11617,7 +11618,7 @@ "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "on-finished": "~2.4.1", - "qs": "~6.14.0", + "qs": "~6.15.1", "raw-body": "~2.5.3", "type-is": "~1.6.18", "unpipe": "~1.0.0" @@ -11632,6 +11633,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -11641,6 +11643,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -11652,7 +11655,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/bonjour-service": { "version": "1.3.0", @@ -12348,6 +12352,7 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -15225,14 +15230,15 @@ } }, "node_modules/express": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", - "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", + "version": "4.22.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.2.tgz", + "integrity": "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "~1.20.3", + "body-parser": "~1.20.5", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", @@ -15251,7 +15257,7 @@ "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", - "qs": "~6.14.0", + "qs": "~6.15.1", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", @@ -22770,6 +22776,7 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -24506,9 +24513,10 @@ } }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.15.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", + "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" }, @@ -24593,6 +24601,7 @@ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", @@ -24608,6 +24617,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -27407,6 +27417,7 @@ "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" From df87b40584639915ffa307a961695e889c2da02d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2026 16:36:20 -0700 Subject: [PATCH 04/11] Bump qs from 6.14.1 to 6.15.2 in /preview (#2496) Bumps [qs](https://github.com/ljharb/qs) from 6.14.1 to 6.15.2. - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.14.1...v6.15.2) --- updated-dependencies: - dependency-name: qs dependency-version: 6.15.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- preview/package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/preview/package-lock.json b/preview/package-lock.json index f2b68ac65..93cf042fd 100644 --- a/preview/package-lock.json +++ b/preview/package-lock.json @@ -695,7 +695,9 @@ } }, "node_modules/qs": { - "version": "6.14.1", + "version": "6.15.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", + "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" From 4f9a987d28231cf485fae6f079b325fa84a17a15 Mon Sep 17 00:00:00 2001 From: vchske Date: Tue, 9 Jun 2026 11:14:17 -0700 Subject: [PATCH 05/11] Removing temporary debug logging (#2509) * Adding further console logging but also fixed lines with JSON.stringify(error) * Added retry mechanism for GETs for armRequest workflow * Moved stringifyError into its own file as it was causing strict compile issues in ErrorHandlingUtils * Removing temporary debug logging * Undoing eslint change as well --- .eslintrc.js | 2 +- src/Common/ErrorHandlingUtils.ts | 1 - src/Common/dataAccess/readDatabases.ts | 51 +++++++------------ src/Explorer/Explorer.tsx | 11 ---- .../generatedClients/cosmos/sqlResources.ts | 10 +--- src/Utils/arm/request.ts | 10 ---- 6 files changed, 19 insertions(+), 66 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index d4675ee95..fb1ed3a73 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -40,7 +40,7 @@ module.exports = { }, ], rules: { - //CTODO uncomment when console debugging is reverted: "no-console": ["error", { allow: ["error", "warn", "dir"] }], + "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 0f205eebc..6996f19cd 100644 --- a/src/Common/ErrorHandlingUtils.ts +++ b/src/Common/ErrorHandlingUtils.ts @@ -21,7 +21,6 @@ export const handleError = ( consoleErrorPrefix?: string, options?: HandleErrorOptions, ): void => { - console.log("{{cdbp}} in handleError(): raw error: " + stringifyError(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 ace64c058..e9f43e65f 100644 --- a/src/Common/dataAccess/readDatabases.ts +++ b/src/Common/dataAccess/readDatabases.ts @@ -1,4 +1,3 @@ -import { stringifyError } from "Common/stringifyError"; import { CosmosDbArtifactType } from "Contracts/FabricMessagesContract"; import { isFabric, isFabricMirroredKey, isFabricNative } from "Platform/Fabric/FabricUtil"; import { AuthType } from "../../AuthType"; @@ -27,7 +26,6 @@ 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; @@ -61,7 +59,6 @@ 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 = [ { @@ -84,15 +81,9 @@ 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) { @@ -117,30 +108,22 @@ export async function readDatabasesWithARM(accountOverride?: { const accountName = accountOverride?.accountName ?? userContext?.databaseAccount?.name ?? ""; const apiType = accountOverride?.apiType ?? userContext.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}`); - } - - 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: " + stringifyError(error)); - throw error; + 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}`); } + + return rpResponse?.value?.map((database) => database.properties?.resource as DataModels.Database) ?? []; } diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx index 03e5e72cd..7b4ee6096 100644 --- a/src/Explorer/Explorer.tsx +++ b/src/Explorer/Explorer.tsx @@ -402,27 +402,19 @@ 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: " + stringifyError(error)); //CTODO this should be logged already but just in case const errorMessage = getErrorMessage(error); TelemetryProcessor.traceFailure( Action.LoadDatabases, @@ -612,7 +604,6 @@ 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, }); @@ -621,7 +612,6 @@ 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) { @@ -641,7 +631,6 @@ 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: " + stringifyError(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 2e1677950..33b7dc620 100644 --- a/src/Utils/arm/generatedClients/cosmos/sqlResources.ts +++ b/src/Utils/arm/generatedClients/cosmos/sqlResources.ts @@ -6,7 +6,6 @@ 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 { stringifyError } from "Common/stringifyError"; import { configContext } from "../../../../ConfigContext"; import { armRequest } from "../../request"; import * as Types from "./types"; @@ -19,14 +18,7 @@ export async function listSqlDatabases( accountName: string, ): Promise { const path = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}/sqlDatabases`; - 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: " + stringifyError(error)); - throw error; - } + return armRequest({ host: configContext.ARM_ENDPOINT, path, method: "GET", apiVersion }); } /* Gets the SQL database under an existing Azure Cosmos DB database account with the provided name. */ diff --git a/src/Utils/arm/request.ts b/src/Utils/arm/request.ts index f76665585..b6a927606 100644 --- a/src/Utils/arm/request.ts +++ b/src/Utils/arm/request.ts @@ -5,7 +5,6 @@ Instead, generate ARM clients that consume this function with stricter typing. */ -import { stringifyError } from "Common/stringifyError"; import promiseRetry, { AbortError } from "p-retry"; import { HttpHeaders } from "../../Common/Constants"; import { configContext } from "../../ConfigContext"; @@ -78,9 +77,6 @@ export async function armRequestWithoutPolling({ } if (!userContext?.authorizationToken && !customHeaders?.["Authorization"]) { - console.log( - "{{cdbp}} in armRequestWithoutPolling(): condition '!userContext?.authorizationToken && !customHeaders?.['Authorization']' met, throwing 'No authority token provided' error", - ); throw new Error("No authority token provided"); } @@ -98,9 +94,6 @@ export async function armRequestWithoutPolling({ }; const effectiveTimeoutMs = timeoutMs ?? DEFAULT_ARM_TIMEOUT_MS; - console.log( - `{{cdbp}} in armRequestWithoutPolling(): calling fetchWithRetry (method=${method}, timeoutMs=${effectiveTimeoutMs}, hasSignal=${!!signal})`, - ); const response = await fetchWithRetry(url.href, fetchInit, method, effectiveTimeoutMs, signal); if (!response.ok) { @@ -115,11 +108,9 @@ export async function armRequestWithoutPolling({ error.code = errorResponse.code; } } catch (error) { - console.log("{{cdbp}} in armRequestWithoutPolling(): ERROR: " + stringifyError(error)); throw new Error(await response.text()); } - console.log("{{cdbp}} in armRequestWithoutPolling(): ERROR: " + stringifyError(error)); throw error; } @@ -184,7 +175,6 @@ async function fetchWithRetry( (attemptNumber: number) => { const attemptTimeoutMs = timeoutMs * RETRY_TIMEOUT_MULTIPLIERS[Math.min(attemptNumber - 1, RETRY_TIMEOUT_MULTIPLIERS.length - 1)]; - console.log(`{{cdbp}} in fetchWithRetry(): calling fetchWithTimeout: attempt=${attemptNumber} url=${url}`); return fetchWithTimeout(url, fetchInit, attemptTimeoutMs); }, { From 40e8dee3570c5da9ed91732917fea2807bdfeb04 Mon Sep 17 00:00:00 2001 From: sunghyunkang1111 <114709653+sunghyunkang1111@users.noreply.github.com> Date: Thu, 11 Jun 2026 10:59:06 -0500 Subject: [PATCH 06/11] Fix playwright token leak (#2512) * ci: route Playwright reports through private Azure Storage container Replaces the public `/playwright-reports/*` static-website uploads and all GitHub Actions artifact uploads for Playwright traces/videos/blob-reports with uploads to a new private container `playwright-reports` on the same storage account. PR comments now link to an Azure Portal blob-properties deep link (requires AAD sign-in) instead of the previously anonymous static-site URL. Fixes MSRC finding: Playwright traces captured on test failure embed Authorization: Bearer headers, and the existing publish path made them anonymously downloadable. The new private container is RBAC-gated (Storage Blob Data Reader/Contributor at container scope) and the storage account already has anonymous blob access and shared-key access disabled. * ci: TEMP smoke-test single Playwright spec to validate MSRC plumbing Reduces the Playwright matrix to 1 shard and restricts the run to a single test in the searchableDropdown component fixture on Chrome. The fixture hits the local dev server only, so no Cosmos auth and no token captures happen \u2014 isolates the smoke test to the new Azure Storage upload/download/zip/PR-comment plumbing. REVERT THIS COMMIT before merging the parent PR. * ci: grant id-token: write to merge-playwright-reports job The merge job overrides workflow-level permissions with its own block (contents: read, pull-requests: write), which silently drops the workflow-level id-token: write. Without it, Azure/login@v2 cannot fetch the federated OIDC token and fails. Bug introduced when the Az login was relocated from the deleted publish-playwright-report job (which had id-token: write) into the merge job. * ci: trigger re-run after RBAC propagation * ci: trigger re-run after E2E_TESTS_CLIENT_ID SP grant * ci: flatten downloaded shard reports before merge az storage blob download-batch preserves the full blob path, but playwright merge-reports expects .zip files directly in the target directory. Flatten with find + mv after download. * ci: switch PR comment to ContainerMenuBlade deep link BlobPropertiesBladeV2 requires undocumented 'tabToload' and 'isDeleted' params we couldn't get past the Portal's grammar validator. ContainerMenuBlade has no required params and drops users directly into the playwright-reports container, where they navigate to \{run_id}-{attempt}/report.zip\ (one extra click vs. blob-direct). * ci: make report path more prominent in PR comment Surface the {run_id}-{attempt}/report.zip path on its own line so reviewers can copy-paste it into the Portal search instead of scanning the navigation prose. * Revert "ci: TEMP smoke-test single Playwright spec to validate MSRC plumbing" This reverts commit 308005f02ba9ea7c4abc5d9f4f6c089e2ff96a85. * ci: refresh OIDC token before shard upload GitHub OIDC client assertions are valid for only 5 minutes (JWT iat -> exp window). Playwright shards that take >5 min exhaust the validity window before the upload step runs, causing AADSTS700024 'Client assertion is not within its valid time range'. Add a fresh Azure/login@v2 step right before the upload to mint a new OIDC token. --- .github/workflows/ci.yml | 125 +++++++++++++++++++++++---------------- 1 file changed, 73 insertions(+), 52 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3ced85dc..7d58ebe85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -299,13 +299,26 @@ jobs: run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --list - name: Run test shard ${{ matrix['shardIndex'] }} of ${{ matrix['shardTotal']}} run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --workers=3 - - name: Upload blob report to GitHub Actions Artifacts + - name: "Re-auth for upload (refresh OIDC token)" if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 + uses: Azure/login@v2 with: - name: blob-report-${{ matrix.shardIndex }} - path: blob-report - retention-days: 1 + client-id: ${{ secrets.E2E_TESTS_CLIENT_ID }} + tenant-id: ${{ secrets.AZURE_TENANT_ID }} + subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + - name: Upload shard blob-report to Azure Storage + if: ${{ !cancelled() }} + env: + KEY: ${{ github.run_id }}-${{ github.run_attempt }} + SHARD: ${{ matrix.shardIndex }} + run: | + az storage blob upload-batch \ + --account-name ${{ secrets.PREVIEW_STORAGE_ACCOUNT_NAME }} \ + --auth-mode login \ + -d playwright-reports \ + -s blob-report \ + --destination-path "${KEY}/shards/shard-${SHARD}" \ + --overwrite true merge-playwright-reports: name: "Merge Playwright Reports" @@ -317,6 +330,7 @@ jobs: permissions: contents: read pull-requests: write + id-token: write steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 @@ -325,29 +339,67 @@ jobs: - name: Install dependencies run: npm ci - - name: Download blob reports from GitHub Actions Artifacts - uses: actions/download-artifact@v4 + - name: "Az CLI login" + uses: Azure/login@v2 with: - path: all-blob-reports - pattern: blob-report-* - merge-multiple: true + client-id: ${{ secrets.AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.AZURE_TENANT_ID }} + subscription-id: ${{ secrets.PREVIEW_SUBSCRIPTION_ID }} + + - name: Download all shard reports from Azure Storage + env: + KEY: ${{ github.run_id }}-${{ github.run_attempt }} + run: | + mkdir -p all-blob-reports + az storage blob download-batch \ + --account-name ${{ secrets.PREVIEW_STORAGE_ACCOUNT_NAME }} \ + --auth-mode login \ + -s playwright-reports \ + --pattern "${KEY}/shards/*" \ + -d ./all-blob-reports + find ./all-blob-reports -type f -name "*.zip" -exec mv -t ./all-blob-reports {} + + find ./all-blob-reports -type d -empty -delete + ls -la ./all-blob-reports - name: Merge into HTML Report run: npx playwright merge-reports --reporter html ./all-blob-reports - - name: Upload HTML report - uses: actions/upload-artifact@v4 - with: - name: html-report--attempt-${{ github.run_attempt }} - path: playwright-report - retention-days: 14 + - name: Bundle merged report into a single zip + run: | + cd playwright-report + zip -r ../report.zip . + cd .. + + - name: Upload report.zip to Azure Storage + env: + KEY: ${{ github.run_id }}-${{ github.run_attempt }} + run: | + az storage blob upload \ + --account-name ${{ secrets.PREVIEW_STORAGE_ACCOUNT_NAME }} \ + --auth-mode login \ + -c playwright-reports \ + -n "${KEY}/report.zip" \ + -f report.zip \ + --overwrite + + - name: Clean up shard intermediates from Azure Storage + if: ${{ always() }} + env: + KEY: ${{ github.run_id }}-${{ github.run_attempt }} + run: | + az storage blob delete-batch \ + --account-name ${{ secrets.PREVIEW_STORAGE_ACCOUNT_NAME }} \ + --auth-mode login \ + -s playwright-reports \ + --pattern "${KEY}/shards/*" - name: Comment Playwright results on PR if: ${{ !cancelled() && github.event_name == 'pull_request' }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR: ${{ github.event.pull_request.number }} - REPORT_URL: https://dataexplorerpreview.z5.web.core.windows.net/playwright-reports/${{ github.run_id }}-${{ github.run_attempt }}/index.html + SA_ID: /subscriptions/${{ secrets.PREVIEW_SUBSCRIPTION_ID }}/resourceGroups/dataexplorer-preview/providers/Microsoft.Storage/storageAccounts/dataexplorerpreview + KEY: ${{ github.run_id }}-${{ github.run_attempt }} RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} run: | PLAYWRIGHT_JSON_OUTPUT_NAME=results.json npx playwright merge-reports --reporter json ./all-blob-reports @@ -355,6 +407,8 @@ jobs: BROKEN=$(gh api "repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}/jobs" \ --jq '[.jobs[] | select(.name | startswith("Run Playwright Tests")) | select(.conclusion == "failure")] | length') if [ "$FAILED" -gt 0 ] || [ "$BROKEN" -gt 0 ]; then ICON="โŒ failed"; else ICON="โœ… passed"; fi + SA_ENC=$(printf '%s' "$SA_ID" | jq -sRr @uri) + CONTAINER_URL="https://portal.azure.com/#view/Microsoft_Azure_Storage/ContainerMenuBlade/~/overview/storageAccountId/${SA_ENC}/path/playwright-reports" NOTE="" [ "$BROKEN" -gt 0 ] && NOTE=" @@ -365,38 +419,5 @@ jobs: | :---: | :---: | :---: | :---: | | $PASSED | $FAILED | $FLAKY | ${DURATION}s | - ๐Ÿ“Š [Open full report]($REPORT_URL) ยท [Workflow run]($RUN_URL)$NOTE" - - publish-playwright-report: - name: "Publish Playwright Report to Blob" - if: ${{ !cancelled() }} - needs: [merge-playwright-reports] - - runs-on: ubuntu-latest - permissions: - id-token: write - contents: read - steps: - - name: Download HTML report artifact - uses: actions/download-artifact@v4 - with: - name: html-report--attempt-${{ github.run_attempt }} - path: playwright-report - - - name: "Az CLI login" - uses: Azure/login@v2 - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - subscription-id: ${{ secrets.PREVIEW_SUBSCRIPTION_ID }} - - - name: Upload Playwright report to blob storage - env: - KEY: ${{ github.run_id }}-${{ github.run_attempt }} - BASE: https://dataexplorerpreview.z5.web.core.windows.net - run: | - az storage blob upload-batch -d '$web' -s playwright-report \ - --destination-path "playwright-reports/${KEY}" \ - --account-name ${{ secrets.PREVIEW_STORAGE_ACCOUNT_NAME }} \ - --auth-mode login --overwrite true - echo "๐Ÿ“Š [Open Playwright report](${BASE}/playwright-reports/${KEY}/index.html)" >> $GITHUB_STEP_SUMMARY + ๐Ÿ“ **Report:** \`${KEY}/report.zip\` + [Open container]($CONTAINER_URL) (Azure sign-in required) โ†’ click into \`${KEY}\` folder โ†’ click \`report.zip\` โ†’ **Download** โ†’ unzip โ†’ open \`index.html\` ยท [Workflow run]($RUN_URL)$NOTE" From ac9ba5ccc653bf17705944113dd2137c1860695a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 10:43:42 -0700 Subject: [PATCH 07/11] Bump shell-quote from 1.7.3 to 1.8.4 (#2511) Bumps [shell-quote](https://github.com/ljharb/shell-quote) from 1.7.3 to 1.8.4. - [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/shell-quote/compare/v1.7.3...v1.8.4) --- updated-dependencies: - dependency-name: shell-quote dependency-version: 1.8.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 27 +++++++++++---------------- package.json | 2 +- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 06535b293..d7536e942 100644 --- a/package-lock.json +++ b/package-lock.json @@ -113,7 +113,7 @@ "react-youtube": "9.0.1", "reflect-metadata": "0.1.13", "rx-jupyter": "5.5.12", - "shell-quote": "1.7.3", + "shell-quote": "1.8.4", "styled-components": "5.0.1", "swr": "0.4.0", "terser-webpack-plugin": "5.3.9", @@ -22334,19 +22334,6 @@ "shell-quote": "^1.8.4" } }, - "node_modules/launch-editor/node_modules/shell-quote": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz", - "integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/leaflet": { "version": "1.9.4", "license": "BSD-2-Clause" @@ -26321,8 +26308,16 @@ } }, "node_modules/shell-quote": { - "version": "1.7.3", - "license": "MIT" + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz", + "integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/shiki": { "version": "1.12.0", diff --git a/package.json b/package.json index 84299d2cc..4f4a1208d 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "react-youtube": "9.0.1", "reflect-metadata": "0.1.13", "rx-jupyter": "5.5.12", - "shell-quote": "1.7.3", + "shell-quote": "1.8.4", "styled-components": "5.0.1", "swr": "0.4.0", "terser-webpack-plugin": "5.3.9", From 7c3d112b83ad656a5954aced4aa4bc5161fa5ae2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 13:08:35 -0700 Subject: [PATCH 08/11] Bump postcss from 8.4.31 to 8.5.15 (#2469) Bumps [postcss](https://github.com/postcss/postcss) from 8.4.31 to 8.5.15. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.31...8.5.15) --- updated-dependencies: - dependency-name: postcss dependency-version: 8.5.10 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d7536e942..39828756f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24035,7 +24035,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", + "version": "8.5.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz", + "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==", "funding": [ { "type": "opencollective", @@ -24052,9 +24054,9 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "nanoid": "^3.3.12", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -24131,6 +24133,24 @@ "version": "4.2.0", "license": "MIT" }, + "node_modules/postcss/node_modules/nanoid": { + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", + "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/prebuild-install": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", @@ -26537,7 +26557,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" From 74b6a92219e24bf4c088bbc8375b32388cf74950 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 15:21:18 -0700 Subject: [PATCH 09/11] Bump ws from 8.17.1 to 8.20.1 (#2514) Bumps [ws](https://github.com/websockets/ws) from 8.17.1 to 8.20.1. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.17.1...8.20.1) --- updated-dependencies: - dependency-name: ws dependency-version: 8.20.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 73 ++++------------------------------------------- package.json | 4 +-- 2 files changed, 7 insertions(+), 70 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39828756f..c172ed01c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -122,7 +122,6 @@ "utility-types": "3.10.0", "uuid": "9.0.0", "web-vitals": "4.2.4", - "ws": "8.17.1", "zustand": "3.5.0" }, "devDependencies": { @@ -214,7 +213,7 @@ "webpack-bundle-analyzer": "5.2.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.2.3", - "ws": "8.17.1" + "ws": "8.20.1" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -19466,27 +19465,6 @@ "node": ">=12" } }, - "node_modules/jest-environment-jsdom/node_modules/ws": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", - "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", - "dev": true, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/jest-environment-jsdom/node_modules/xml-name-validator": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", @@ -28314,27 +28292,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/webpack-bundle-analyzer/node_modules/ws": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", - "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", - "dev": true, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/webpack-cli": { "version": "5.1.4", "dev": true, @@ -29141,27 +29098,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz", - "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==", - "dev": true, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/webpack-merge": { "version": "5.10.0", "dev": true, @@ -29539,10 +29475,11 @@ } }, "node_modules/ws": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", - "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "version": "8.20.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz", + "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, diff --git a/package.json b/package.json index 4f4a1208d..9843793e6 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "utility-types": "3.10.0", "uuid": "9.0.0", "web-vitals": "4.2.4", - "ws": "8.17.1", + "ws": "8.20.1", "zustand": "3.5.0" }, "overrides": { @@ -224,7 +224,7 @@ "webpack-bundle-analyzer": "5.2.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.2.3", - "ws": "8.17.1" + "ws": "8.20.1" }, "scripts": { "postinstall": "patch-package && npm run generate:i18n-keys", From d19c7e0cb76c8464fdbe7852aaf79946ced9679a Mon Sep 17 00:00:00 2001 From: jawelton74 <103591340+jawelton74@users.noreply.github.com> Date: Mon, 15 Jun 2026 06:29:14 -0700 Subject: [PATCH 10/11] =?UTF-8?q?Remove=20Phoenix=20&=20Notebooks=20?= =?UTF-8?q?=E2=80=94=20Phase=201:=20Decouple=20database=20shells=20to=20Cl?= =?UTF-8?q?oudShell=20(#2513)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add implementation plan for removing Phoenix and notebooks Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Phase 1: Decouple database shells from Phoenix to CloudShell-only Migrate all shell terminals to the CloudShell path and remove the legacy Phoenix notebook-server terminal code so shells no longer depend on notebook provisioning. - TerminalTab now always uses CloudShellTerminalComponentAdapter; removed the notebook-server adapter branch, getNotebookServerInfo, and the dead VCoreMongo firewall check - Migrate Postgres and VCore Mongo quickstart tabs to CloudShellTerminalComponent (drop allocateContainer/useNotebook dependencies) - Refactor useTerminal to send input via the CloudShell WebSocket instead of postRobot/iframe; register the socket from CloudShellTerminalComponent - Simplify Explorer.openNotebookTerminal to always open a CloudShell terminal - Delete NotebookTerminalComponent(+test/less/snapshot), NotebookTerminalComponentAdapter, and the src/Terminal/ entry point - Remove the terminal.html webpack entry/HTML plugin and src/Terminal from tsconfig.strict.json Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- docs/remove-notebooks-plan.md | 214 ++++++++++++++++++ .../Notebook/NotebookTerminalComponent.less | 13 -- .../NotebookTerminalComponent.test.tsx | 146 ------------ .../Notebook/NotebookTerminalComponent.tsx | 99 -------- .../NotebookTerminalComponent.test.tsx.snap | 73 ------ src/Explorer/Explorer.tsx | 21 +- .../CloudShellTerminalComponent.tsx | 11 +- src/Explorer/Tabs/QuickstartTab.tsx | 42 +--- .../NotebookTerminalComponentAdapter.tsx | 32 --- src/Explorer/Tabs/Tabs.tsx | 6 +- src/Explorer/Tabs/TerminalTab.tsx | 82 +------ src/Explorer/Tabs/VCoreMongoQuickstartTab.tsx | 77 +------ src/Main.tsx | 1 - src/Terminal/JupyterLabAppFactory.ts | 125 ---------- src/Terminal/NotebookAppContracts.d.ts | 111 --------- src/Terminal/README.md | 74 ------ src/Terminal/TerminalProps.ts | 15 -- src/Terminal/index.css | 26 --- src/Terminal/index.html | 13 -- src/Terminal/index.ts | 125 ---------- src/hooks/useTerminal.ts | 24 +- tsconfig.strict.json | 1 - webpack.config.js | 6 - 23 files changed, 259 insertions(+), 1078 deletions(-) create mode 100644 docs/remove-notebooks-plan.md delete mode 100644 src/Explorer/Controls/Notebook/NotebookTerminalComponent.less delete mode 100644 src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx delete mode 100644 src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx delete mode 100644 src/Explorer/Controls/Notebook/__snapshots__/NotebookTerminalComponent.test.tsx.snap delete mode 100644 src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx delete mode 100644 src/Terminal/JupyterLabAppFactory.ts delete mode 100644 src/Terminal/NotebookAppContracts.d.ts delete mode 100644 src/Terminal/README.md delete mode 100644 src/Terminal/TerminalProps.ts delete mode 100644 src/Terminal/index.css delete mode 100644 src/Terminal/index.html delete mode 100644 src/Terminal/index.ts diff --git a/docs/remove-notebooks-plan.md b/docs/remove-notebooks-plan.md new file mode 100644 index 000000000..9b6104509 --- /dev/null +++ b/docs/remove-notebooks-plan.md @@ -0,0 +1,214 @@ +# Implementation Plan: Remove Phoenix & Notebooks + +## Problem statement + +Cosmos Explorer contains a large, deeply-integrated **notebooks** feature backed by +the **Phoenix** compute-container service and the **Juno** service, plus a **GitHub** +integration used to pin/browse notebook repositories. This functionality is being +retired. The goal is to remove all notebooks/Phoenix/Juno/GitHub-for-notebooks code, +dependencies, UI surfaces, telemetry, and configuration, while **preserving the +database shell terminals** (Mongo / Cassandra / Postgres / VCoreMongo), which today +share the Terminal infrastructure with notebooks. + +This document is the implementation plan only. No code changes are made here. + +## Scope decisions (confirmed) + +- **Database shells**: Keep the Mongo/Cassandra/Postgres/VCoreMongo shells, but migrate + them to use the **CloudShell** path exclusively. Remove the legacy Phoenix + notebook-server shell path. +- **GitHub integration**: Remove entirely (it exists only for notebook pinned repos). +- **Schema Analyzer** (`src/Explorer/Notebook/SchemaAnalyzer`): Remove. +- **Phasing**: Every phase must leave the app in a **buildable, shippable** state + (build + lint + strict compile + unit tests green; shells still work). +- **Localization**: Remove notebook/GitHub strings from **all** resource files โ€” + `src/Localization/en/Resources.json` **and** every non-English locale + (`src/Localization//Resources.json`). (This deletion is an exception to the + usual convention of editing only the English file.) + +## Prior art / related commits + +This is a continuation of an in-progress removal effort. Reference commits: + +- `7295d63a` โ€” Remove gallery.html and all associated gallery functionality (#2474) +- `a36467f4` โ€” Remove Phoenix `getDbAccountAllowedStatus`; `isPhoenixNotebooks`/ + `isPhoenixFeatures` now always `false` (#2472) +- `31385950` โ€” removed NotebookViewer file (#2281) + +> **Note:** An unmerged branch `users/jawelton/remove-notebooks-terminal-052126` +> already contains related work (`5989c77c` "Remove terminal.html webpack entry point +> and notebooks terminal code", `c7f9d7e3` "Switch VCore Mongo quickstart to use +> CloudShell terminal"). These are **not** in `master`. Reconcile with that branch +> before/while starting Phase 1 to avoid duplicate or conflicting work. + +## Current-state survey (what exists today) + +**Core directories / files** +- `src/Phoenix/PhoenixClient.ts` โ€” container allocation, heartbeat, status polling. +- `src/Juno/JunoClient.ts` (+ test) โ€” pinned-repo / notebook metadata service client. +- `src/Explorer/Notebook/` โ€” the bulk of the feature: + - `useNotebook.ts` (Zustand store), `NotebookManager.tsx`, `NotebookContentClient.ts`, + `NotebookClientV2.ts`, `NotebookContainerClient.ts`, `NotebookContentItem.ts`, + `NotebookUtil.ts`, `NTeractUtil.ts`, `FileSystemUtil.ts` + - `NotebookComponent/` (nteract redux store, epics, reducers, content providers) + - `NotebookRenderer/` (nteract cell rendering, decorators, outputs) + - `SchemaAnalyzer/`, `SecurityWarningBar/` +- `src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx` (+ less/test) +- `src/Explorer/Controls/NotebookViewer/` โ€” read-only viewer + metadata. +- `src/Explorer/Tabs/NotebookV2Tab.ts`, `NotebookTabBase.ts`, `SchemaAnalyzerTab.ts` +- `src/Explorer/Panes/CopyNotebookPane/` +- `src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx` +- `src/CellOutputViewer/` โ€” webpack entry `cellOutputViewer`. +- `src/Utils/NotebookConfigurationUtils.ts`, `src/hooks/useNotebookSnapshotStore.ts` +- `src/Utils/arm/generatedClients/cosmosNotebooks/` โ€” generated ARM client. + +**GitHub integration (notebook-only)** +- `src/GitHub/` (`GitHubClient.ts`, `GitHubContentProvider.ts`, `GitHubOAuthService.ts`, + `GitHubConnector.ts`), `src/Utils/GitHubUtils.ts` +- `src/Explorer/Controls/GitHub/` (AuthorizeAccess, AddRepo, GitHubRepos components) +- `src/Explorer/Panes/GitHubReposPanel/` +- webpack entry `connectToGitHub` + `src/connectToGitHub.html` + +**Integration / glue points (edited, not deleted)** +- `src/Explorer/Explorer.tsx` โ€” `phoenixClient`, `notebookManager`, `gitHubOAuthService`, + `initNotebooks`, `initiateAndRefreshNotebookList`, `allocateContainer`, + `openNotebook*`, `openNotebookTerminal`, `createNotebookContentItemFile`, etc. +- `src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx` (+ adapter, test) + โ€” New Notebook / Open Terminal / shell buttons branching on `isShellEnabled`. +- `src/Explorer/Tree/treeNodeUtil.tsx` / `ResourceTreeAdapter.tsx` / `ResourceTree.tsx` + โ€” "My Notebooks" / "GitHub" tree nodes; `isNotebookEnabled` plumbing. +- `src/Explorer/SplashScreen/SplashScreen.tsx` โ€” notebook cards + `openNotebookTerminal` + for Postgres/VCoreMongo shells. +- `src/Explorer/Tabs/TerminalTab.tsx` โ€” chooses CloudShell vs notebook-server adapter. +- `src/Explorer/OpenActions/OpenActions.tsx`, `src/Explorer/ContextMenuButtonFactory.tsx`, + `src/Explorer/Tree/Collection.ts`, `src/Explorer/useSelectedNode.ts`, + `src/Explorer/MostRecentActivity/MostRecentActivity.ts` +- `src/hooks/useKnockoutExplorer.ts`, `src/hooks/useTabs.ts` +- `src/ConfigContext.ts`, `src/Common/Constants.ts`, `src/Contracts/DataModels.ts`, + `src/Contracts/ViewModels.ts`, `src/Contracts/ActionContracts.ts`, + `src/Platform/Hosted/extractFeatures.ts` (+ test) +- `src/Shared/Telemetry/TelemetryConstants.ts` +- `src/Localization/en/Resources.json` **and all non-English** `src/Localization//Resources.json` +- `webpack.config.js` โ€” `cellOutputViewer`, `connectToGitHub` entries + HTML plugins. +- `package.json` โ€” `@nteract/*`, `@jupyterlab/*`, `@phosphor/widgets`, `rx-jupyter`, + and other notebook-only dependencies. + +**Critical coupling โ€” Terminal / shells** +- `TerminalTab` uses `CloudShellTerminalComponentAdapter` when + `userContext.features.enableCloudShell`, otherwise `NotebookTerminalComponentAdapter` + (which needs a Phoenix-allocated notebook server + `terminal.html` iframe). +- Command-bar/splash shell buttons branch on + `useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell`. +- `Explorer.openNotebookTerminal(...)` is the shared entry for opening shells and must + be retained (and rewired to CloudShell-only) โ€” only its notebook-server behavior is + removed. + +## Phased approach + +Each phase is independently buildable and shippable. Within each phase, **all +references to removed code are also removed** so the tree compiles. After every phase +run: `npm run compile`, `npm run compile:strict`, `npm run lint`, `npm run format:check`, +`npm test`, and a webpack build (`npm run build:ci`); manually verify the four shells +still open. + +### Phase 1 โ€” Decouple database shells to CloudShell-only +Remove the legacy Phoenix notebook-server terminal path so shells no longer depend on +notebook provisioning. +- Rewire `TerminalTab` to always use `CloudShellTerminalComponentAdapter`; delete the + `NotebookTerminalComponentAdapter` branch and `getNotebookServerInfo`. +- Delete `src/Explorer/Tabs/ShellAdapters/NotebookTerminalComponentAdapter.tsx` and + `src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx` (+ less/test/snapshot). +- Simplify shell buttons in `CommandBarComponentButtonFactory` and `SplashScreen` to + drop the `isShellEnabled` branch (CloudShell path only); keep `openNotebookTerminal`. +- Verify whether the `terminal`/`terminal.html` webpack entry is still needed by + CloudShell. If unused, remove it and `src/Terminal/`; otherwise keep. +- **Outcome:** Shells run purely on CloudShell. Phoenix no longer needed for terminals. + +### Phase 2 โ€” Remove the in-app notebook authoring & rendering experience +Delete the notebook tabs, the nteract rendering engine, panes, and the read-only viewer, +and remove all UI entry points that open notebooks. +- Delete: `src/Explorer/Notebook/NotebookComponent/`, + `src/Explorer/Notebook/NotebookRenderer/`, `src/Explorer/Notebook/SecurityWarningBar/`, + `NotebookClientV2.ts`, `notebookClientV2.test.ts`, `NotebookContentClient.ts`, + `NTeractUtil.ts`, `NotebookContentItem.ts`, `NotebookUtil.ts` (+ test), + `FileSystemUtil.ts`. +- Delete tabs/panes/viewer: `src/Explorer/Tabs/NotebookV2Tab.ts`, `NotebookTabBase.ts`, + `src/Explorer/Panes/CopyNotebookPane/`, `src/Explorer/Controls/NotebookViewer/`, + `src/CellOutputViewer/` (+ `cellOutputViewer` webpack entry & HTML plugin). +- Remove notebook entry points: "New Notebook"/open-notebook buttons in + `CommandBarComponentButtonFactory` (+ test), `OpenActions.tsx`, + `ContextMenuButtonFactory.tsx`, splash-screen notebook cards & recent-notebook items + (`MostRecentActivity` OpenNotebook type), and the `openNotebook*` / + `createNotebookContentItemFile` methods on `Explorer`. +- Remove notebook deps from `package.json`: `@nteract/*`, `@jupyterlab/*`, + `@phosphor/widgets`, `rx-jupyter` (and any now-unused transitive notebook-only libs). +- **Outcome:** Notebooks can no longer be authored, opened, or rendered. + +### Phase 3 โ€” Remove Schema Analyzer +- Delete `src/Explorer/Notebook/SchemaAnalyzer/` and `src/Explorer/Tabs/SchemaAnalyzerTab.ts`. +- Remove Schema Analyzer command-bar button and any tree/menu entry points. + +### Phase 4 โ€” Remove GitHub integration +- Delete `src/GitHub/`, `src/Explorer/Controls/GitHub/`, + `src/Explorer/Panes/GitHubReposPanel/`, `src/Utils/GitHubUtils.ts`, + `src/connectToGitHub.html`, and the `connectToGitHub` webpack entry & HTML plugin. +- Remove `gitHubOAuthService`, GitHub pinned-repo wiring, and `gitHubNotebooksContentRoot` + usage from `Explorer.tsx`, `useNotebook.ts`, `NotebookManager.tsx`, and `JunoClient` + pinned-repo methods. +- Remove GitHub-related localization keys from **all** locale files (`en` + non-English). + +### Phase 5 โ€” Remove Phoenix and the notebook container/allocation core +- Delete `src/Phoenix/`, `src/Explorer/Notebook/NotebookContainerClient.ts`, + `src/Explorer/Notebook/NotebookManager.tsx`, `src/Explorer/Notebook/useNotebook.ts`, + `src/Utils/NotebookConfigurationUtils.ts`, `src/hooks/useNotebookSnapshotStore.ts`. +- Remove from `Explorer.tsx`: `phoenixClient`, `notebookManager`, `_isInitializingNotebooks`, + `initNotebooks`, `initiateAndRefreshNotebookList`, `refreshNotebookList`, + `allocateContainer`, container heartbeat/connection logic, and notebook-server URL + feature overrides. +- Remove notebook tree nodes ("My Notebooks") and `isNotebookEnabled` plumbing from + `treeNodeUtil.tsx`, `ResourceTreeAdapter.tsx`, `ResourceTree.tsx`, `Collection.ts`, + `useSelectedNode.ts` (+ update tree snapshots/tests). +- Remove notebook initialization from `useKnockoutExplorer.ts` and notebook tab handling + in `useTabs.ts`. + +### Phase 6 โ€” Remove residual clients, config, contracts, telemetry & strings +- Delete `src/Juno/` and `src/Utils/arm/generatedClients/cosmosNotebooks/`. +- Remove notebook fields from `ConfigContext.ts`, `Constants.ts` (Notebook namespace), + `DataModels.ts` (notebook/Phoenix/container interfaces), `ViewModels.ts`, + `ActionContracts.ts`, and notebook feature flags from + `extractFeatures.ts` (+ update test). +- Remove notebook/Phoenix telemetry actions/areas from `TelemetryConstants.ts` (preserve + enum numbering if other systems depend on it โ€” mirror the cautious approach in + `a36467f4`). +- Remove remaining notebook strings from **all** locale `Resources.json` files (`en` + + every non-English locale) and any notebook images (e.g. `images/notebook/`). +- Final full build + test sweep; update `EndpointUtils.ts` (`allowedNotebookServerUrls`) + and any docs/comments referencing notebooks. + +## Cross-cutting verification (run after each phase) + +``` +npm run compile +npm run compile:strict +npm run lint +npm run format:check +npm test +npm run build:ci +``` +Plus manual smoke test: open Mongo, Cassandra, Postgres, and VCoreMongo shells. + +## Notes & considerations + +- **Strict null checks:** any file edited may need to stay in / be removed from + `tsconfig.strict.json`. Remove deleted files from that list. +- **Snapshots:** several Jest snapshots reference notebook UI + (`treeNodeUtil`, `SettingsComponent`, panel snapshots). Regenerate after edits. +- **Telemetry enum safety:** prior commit `a36467f4` deliberately reverted removal of + enum values to avoid breaking downstream consumers. Prefer leaving enum numeric values + intact unless confirmed safe to remove. +- **`enableCloudShell` feature flag:** confirm it is enabled in all target environments + before removing the Phoenix shell fallback, or shells will break. +- **E2E tests:** check `test/` for notebook/terminal specs to update or remove; shells + may have E2E coverage that needs the CloudShell-only path. +- **Reconcile** with branch `users/jawelton/remove-notebooks-terminal-052126` to avoid + rework, especially in Phase 1. diff --git a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.less b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.less deleted file mode 100644 index 305c8827c..000000000 --- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.less +++ /dev/null @@ -1,13 +0,0 @@ -@import "../../../../less/Common/Constants"; - -.notebookTerminalContainer { - padding: @DefaultSpace; - height: 100%; - width: 100%; - - iframe { - border: none; - height: 100%; - width: 100%; - } -} \ No newline at end of file diff --git a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx deleted file mode 100644 index bd816ac31..000000000 --- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx +++ /dev/null @@ -1,146 +0,0 @@ -import { shallow } from "enzyme"; -import React from "react"; -import * as DataModels from "../../../Contracts/DataModels"; -import { NotebookTerminalComponent, NotebookTerminalComponentProps } from "./NotebookTerminalComponent"; - -const testAccount: DataModels.DatabaseAccount = { - id: "id", - kind: "kind", - location: "location", - name: "name", - properties: { - documentEndpoint: "https://testDocumentEndpoint.azure.com/", - }, - type: "type", -}; - -const testMongo32Account: DataModels.DatabaseAccount = { - ...testAccount, -}; - -const testMongo36Account: DataModels.DatabaseAccount = { - ...testAccount, - properties: { - mongoEndpoint: "https://testMongoEndpoint.azure.com/", - }, -}; - -const testCassandraAccount: DataModels.DatabaseAccount = { - ...testAccount, - properties: { - cassandraEndpoint: "https://testCassandraEndpoint.azure.com/", - }, -}; - -const testPostgresAccount: DataModels.DatabaseAccount = { - ...testAccount, - properties: { - postgresqlEndpoint: "https://testPostgresEndpoint.azure.com/", - }, -}; - -const testVCoreMongoAccount: DataModels.DatabaseAccount = { - ...testAccount, - properties: { - vcoreMongoEndpoint: "https://testVCoreMongoEndpoint.azure.com/", - }, -}; - -const testNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = { - authToken: "authToken", - notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com", - forwardingId: "Id", -}; - -const testMongoNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = { - authToken: "authToken", - notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo", - forwardingId: "Id", -}; - -const testCassandraNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = { - authToken: "authToken", - notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/cassandra", - forwardingId: "Id", -}; - -const testPostgresNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = { - authToken: "authToken", - notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/postgresql", - forwardingId: "Id", -}; - -const testVCoreMongoNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = { - authToken: "authToken", - notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongovcore", - forwardingId: "Id", -}; - -describe("NotebookTerminalComponent", () => { - it("renders terminal", () => { - const props: NotebookTerminalComponentProps = { - databaseAccount: testAccount, - notebookServerInfo: testNotebookServerInfo, - tabId: undefined, - }; - - const wrapper = shallow(); - expect(wrapper).toMatchSnapshot(); - }); - - it("renders mongo 3.2 shell", () => { - const props: NotebookTerminalComponentProps = { - databaseAccount: testMongo32Account, - notebookServerInfo: testMongoNotebookServerInfo, - tabId: undefined, - }; - - const wrapper = shallow(); - expect(wrapper).toMatchSnapshot(); - }); - - it("renders mongo 3.6 shell", () => { - const props: NotebookTerminalComponentProps = { - databaseAccount: testMongo36Account, - notebookServerInfo: testMongoNotebookServerInfo, - tabId: undefined, - }; - - const wrapper = shallow(); - expect(wrapper).toMatchSnapshot(); - }); - - it("renders cassandra shell", () => { - const props: NotebookTerminalComponentProps = { - databaseAccount: testCassandraAccount, - notebookServerInfo: testCassandraNotebookServerInfo, - tabId: undefined, - }; - - const wrapper = shallow(); - expect(wrapper).toMatchSnapshot(); - }); - - it("renders Postgres shell", () => { - const props: NotebookTerminalComponentProps = { - databaseAccount: testPostgresAccount, - notebookServerInfo: testPostgresNotebookServerInfo, - tabId: undefined, - }; - - const wrapper = shallow(); - expect(wrapper).toMatchSnapshot(); - }); - - it("renders vCore Mongo shell", () => { - const props: NotebookTerminalComponentProps = { - databaseAccount: testVCoreMongoAccount, - notebookServerInfo: testVCoreMongoNotebookServerInfo, - tabId: undefined, - username: "username", - }; - - const wrapper = shallow(); - expect(wrapper).toMatchSnapshot(); - }); -}); diff --git a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx deleted file mode 100644 index 96d41155e..000000000 --- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx +++ /dev/null @@ -1,99 +0,0 @@ -/** - * Wrapper around Notebook server terminal - */ - -import { useTerminal } from "hooks/useTerminal"; -import postRobot from "post-robot"; -import * as React from "react"; -import * as DataModels from "../../../Contracts/DataModels"; -import { TerminalProps } from "../../../Terminal/TerminalProps"; -import { userContext } from "../../../UserContext"; -import * as StringUtils from "../../../Utils/StringUtils"; - -export interface NotebookTerminalComponentProps { - notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo; - databaseAccount: DataModels.DatabaseAccount; - tabId: string; - username?: string; -} - -export class NotebookTerminalComponent extends React.Component { - private terminalWindow: Window; - - constructor(props: NotebookTerminalComponentProps) { - super(props); - } - - componentDidMount(): void { - this.sendPropsToTerminalFrame(); - } - - public render(): JSX.Element { - return ( -
-