From cc9605428769c5e1d2f3b1b4c15bd0dba0cbc491 Mon Sep 17 00:00:00 2001 From: Carlos Emiliano Castro Trejo <102700317+ccastrotrejo@users.noreply.github.com> Date: Mon, 11 Dec 2023 09:17:34 -0800 Subject: [PATCH] fix(vscode): Codefixes for workspace file creation, dotnet installation and designer refresh (#3818) * fix(vscode): Add validation for workspace folder path as string (#3659) (#3779) Validation for workspace folder path as string * fix(vscode): Check list of files in dotnet binary installation (#3813) Add decision for files is an array * feat(vscode): Remove designer refresh and add window message (#3816) Remove designer refresh and add window message --- .../commands/createCodeless/createCodeless.ts | 2 +- .../openDesignerForLocalProject.ts | 23 +++++-------------- .../src/app/utils/dotnet/dotnet.ts | 12 ++++++---- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/apps/vs-code-designer/src/app/commands/createCodeless/createCodeless.ts b/apps/vs-code-designer/src/app/commands/createCodeless/createCodeless.ts index 489158cfdb1..c4a0466e7c1 100644 --- a/apps/vs-code-designer/src/app/commands/createCodeless/createCodeless.ts +++ b/apps/vs-code-designer/src/app/commands/createCodeless/createCodeless.ts @@ -32,7 +32,7 @@ export async function createCodeless( workspacePath = isString(workspacePath) ? workspacePath : undefined; if (workspacePath === undefined) { workspaceFolder = await getWorkspaceFolder(context); - workspacePath = workspaceFolder.uri.fsPath; + workspacePath = isString(workspaceFolder) ? workspaceFolder : workspaceFolder.uri.fsPath; } else { workspaceFolder = getContainingWorkspace(workspacePath); } diff --git a/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerForLocalProject.ts b/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerForLocalProject.ts index 54ddce1f204..899a21974f4 100644 --- a/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerForLocalProject.ts +++ b/apps/vs-code-designer/src/app/commands/workflows/openDesigner/openDesignerForLocalProject.ts @@ -126,23 +126,12 @@ export default class OpenDesignerForLocalProject extends OpenDesignerBase { this.panel.onDidChangeViewState( async (event) => { const eventPanel: WebviewPanel = event.webviewPanel; - this.panelMetadata = await this._getDesignerPanelMetadata(this.migrationOptions); - eventPanel.webview.html = await this.getWebviewContent({ - connectionsData: this.panelMetadata.connectionsData, - parametersData: this.panelMetadata.parametersData || {}, - localSettings: this.panelMetadata.localSettings, - artifacts: this.panelMetadata.artifacts, - azureDetails: this.panelMetadata.azureDetails, - workflowDetails: this.panelMetadata.workflowDetails, - }); - this.sendMsgToWebview({ - command: ExtensionCommand.update_panel_metadata, - data: { - panelMetadata: this.panelMetadata, - connectionData: this.connectionData, - apiHubServiceDetails: this.apiHubServiceDetails, - }, - }); + if (eventPanel.visible) { + window.showInformationMessage( + localize('designer.restart', 'If changes were made to logic app files, restart designer to see the latest changes.'), + 'OK' + ); + } }, undefined, ext.context.subscriptions diff --git a/apps/vs-code-designer/src/app/utils/dotnet/dotnet.ts b/apps/vs-code-designer/src/app/utils/dotnet/dotnet.ts index 0125095db2b..b44273f016c 100644 --- a/apps/vs-code-designer/src/app/utils/dotnet/dotnet.ts +++ b/apps/vs-code-designer/src/app/utils/dotnet/dotnet.ts @@ -191,11 +191,13 @@ export async function getLocalDotNetVersionFromBinaries(): Promise { // First try to get sdk from Binary installation folder const files = fs.existsSync(sdkVersionFolder) ? fs.readdirSync(sdkVersionFolder, { withFileTypes: true }) : null; - for (const file of files) { - if (file.isDirectory()) { - const version = file.name; - await executeCommand(ext.outputChannel, undefined, 'echo', 'Local binary .NET SDK version', version); - return version; + if (Array.isArray(files)) { + for (const file of files) { + if (file.isDirectory()) { + const version = file.name; + await executeCommand(ext.outputChannel, undefined, 'echo', 'Local binary .NET SDK version', version); + return version; + } } }