random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-05-12 19:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wording and Primary Button timeout

Browse Source
This commit is contained in:
Justin Kolasa (from Dev Box) 2025-05-02 10:53:24 -04:00
parent 2aad3cdb18
commit 26d630d6d5
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/Explorer/Explorer.tsx
View File

@ -283,40 +283,8 @@ export default class Explorer {
} }
public openInVsCode(): void { public openInVsCode(): void {
const startTime = Date.now();
let vsCodeNotOpened = false;
setTimeout(() => {
if (!vsCodeNotOpened && Date.now() - startTime < 1200) {
vsCodeNotOpened = true;
useDialog.getState().openDialog(openVSCodeDialogProps);
}
}, 1000);
TelemetryProcessor.traceStart(Action.OpenVSCode); TelemetryProcessor.traceStart(Action.OpenVSCode);
this.openVsCodeButtonClick(); this.openVsCodeButtonClick();
const openVSCodeDialogProps: DialogProps = {
linkProps: {
linkText: "Download Visual Studio Code",
linkUrl: "https://code.visualstudio.com/download",
},
isModal: true,
title: ` Open your Cosmos DB account in Visual Studio Code`,
subText: `Please ensure Visual Studio Code is installed on your device.
If you don't have it installed, please download it from the link below.`,
primaryButtonText: "Open VS Code",
secondaryButtonText: "Cancel",
onPrimaryButtonClick: () => {
this.openVsCodeButtonClick();
useDialog.getState().closeDialog();
},
onSecondaryButtonClick: () => {
useDialog.getState().closeDialog();
TelemetryProcessor.traceCancel(Action.OpenVSCode);
},
};
} }
public openVsCodeButtonClick = (): void => { public openVsCodeButtonClick = (): void => {
@ -326,8 +294,18 @@ export default class Explorer {
const container = encodeURIComponent(activeTab?.collection?.id()); const container = encodeURIComponent(activeTab?.collection?.id());
const baseUrl = `vscode://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 vscodeUrl = activeTab ? `${baseUrl}&database=${database}&container=${container}` : baseUrl;
const startTime = Date.now();
let vsCodeNotOpened = false; let vsCodeNotOpened = false;
setTimeout(() => {
const timeOutTime = Date.now() - startTime;
console.log("Timed out in: ", timeOutTime);
if (!vsCodeNotOpened && timeOutTime < 1300) {
vsCodeNotOpened = true;
useDialog.getState().openDialog(openVSCodeDialogProps);
}
}, 1000);
try { try {
window.location.href = vscodeUrl; window.location.href = vscodeUrl;
TelemetryProcessor.traceStart(Action.OpenVSCode); TelemetryProcessor.traceStart(Action.OpenVSCode);
@ -337,6 +315,29 @@ export default class Explorer {
logConsoleError(`Failed to open VS Code: ${getErrorMessage(error)}`); logConsoleError(`Failed to open VS Code: ${getErrorMessage(error)}`);
} }
} }
const openVSCodeDialogProps: DialogProps = {
linkProps: {
linkText: "Download Visual Studio Code",
linkUrl: "https://code.visualstudio.com/download",
},
isModal: true,
title: ` Open your Azure Cosmos DB account in Visual Studio Code`,
subText: `Please ensure Visual Studio Code is installed on your device.
If you don't have it installed, please download it from the link below.`,
primaryButtonText: "Open in VS Code",
secondaryButtonText: "Cancel",
onPrimaryButtonClick: () => {
vsCodeNotOpened = false;
this.openVsCodeButtonClick();
useDialog.getState().closeDialog();
},
onSecondaryButtonClick: () => {
useDialog.getState().closeDialog();
TelemetryProcessor.traceCancel(Action.OpenVSCode);
},
};
}; };
public async openCESCVAFeedbackBlade(): Promise<void> { public async openCESCVAFeedbackBlade(): Promise<void> {