From 6d604490d3f1b1252d3536a8b614d68bf08182d5 Mon Sep 17 00:00:00 2001 From: JustinKol <144163838+JustinKol@users.noreply.github.com> Date: Tue, 13 May 2025 10:26:54 -0400 Subject: [PATCH 1/2] URL Correction in VS Code link (#2142) * master pull * Reverting .npmrc file * Removed logging userContext * Prettier run * Added support for opening CosmosDB Account without clicking database tab * Reverting change in settings.json * Prettier run * Added check if the link closed * Added check if the link didn't closed * Check if VS Code was opened, if not popup with download button link * Prettier run * Redirect to Download VS Code if not opened * Added error message to VS Code timeout and redirect * Fixing baseUrl from testing * Increased timeout for when user is asked to open VS Code * switched to iframe for redirects * Fixed VS Code url * Removed insider url * Added log messages * Added link to vCore data explorer dashboard * Increased timeout to 2.5 secs to see if that helps with VS Code open popup * Changed to dialog box * Changed param name * Increase startTime for extra popup * Changed to dialog box only when no VS Code detected * Fixed vscode url * Changed title back to Open CosmosDB in VS Code * Added text on required extensions * Removed text on required extensions as it will prompt by default * Fixed wording and Primary Button timeout * Spelled out VS Code * Removed console log of timeout * Updated snapshots and lowered timeout * Remove VS Code button from Gremlin * Prettier run on CommandBarComponentButtonFactory * Changed from referencing location to a link * Prettier run * Reverting back to popup for opening * Updated unit test snapshots * Added vscode: to Content Security Policy * Reverting back to popup only if opening times out * Corrected misspelled url * Corrected url --- src/Explorer/Explorer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx index 5c619663f..0f0670ecc 100644 --- a/src/Explorer/Explorer.tsx +++ b/src/Explorer/Explorer.tsx @@ -292,7 +292,7 @@ export default class Explorer { const resourceId = encodeURIComponent(userContext.databaseAccount.id); const database = encodeURIComponent(activeTab?.collection?.databaseId); const container = encodeURIComponent(activeTab?.collection?.id()); - const baseUrl = `vscod://ms-azuretools.vscode-cosmosdb?resourceId=${resourceId}`; + const baseUrl = `vscode://ms-azuretools.vscode-cosmosdb?resourceId=${resourceId}`; const vscodeUrl = activeTab ? `${baseUrl}&database=${database}&container=${container}` : baseUrl; const startTime = Date.now(); let vsCodeNotOpened = false; From 44d815454c7aa3efa70727e1c3a5786577afff9d Mon Sep 17 00:00:00 2001 From: Nishtha Ahuja <45535788+nishthaAhujaa@users.noreply.github.com> Date: Tue, 13 May 2025 20:04:12 +0530 Subject: [PATCH 2/2] for manual isAutoscale is supposed to be false (#2141) Co-authored-by: nishthaAhujaa --- .../ThroughputInputAutoPilotV3Component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx index 2ae5dcfc9..0a9b90254 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx @@ -285,7 +285,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component< serverId, numberOfRegions, isMultimaster, - true, + false, ); return (