Fixes to exporting of plots to pdf (#16281)

* Log and display errors when failing to export plot * Include message * Fixes to builds
microsoft · Dec 10, 2024 · 1706ffd · 1706ffd
1 parent fd909a4
commit 1706ffd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/build/esbuild/build.ts b/build/esbuild/build.ts
@@ -328,11 +328,15 @@ async function buildAll() {
 
                 .map(async (module) => {
                     const fullPath = require.resolve(module);
-                    return build(fullPath, path.join(extensionFolder, 'dist', 'node_modules', `${module}.js`), {
-                        target: 'desktop',
-                        // These almost never change, easier to re-run copmilation if packges change.
-                        watch: false
-                    });
+                    return build(
+                        fullPath,
+                        path.join(extensionFolder, 'dist', 'node_modules', `${path.join(module, 'index.js')}`),
+                        {
+                            target: 'desktop',
+                            // These almost never change, easier to re-run copmilation if packges change.
+                            watch: false
+                        }
+                    );
                 })
         );
         builders.push(

diff --git a/src/webviews/extension-side/plotView/rendererCommunication.ts b/src/webviews/extension-side/plotView/rendererCommunication.ts
@@ -10,6 +10,8 @@ import { IDisposable } from '../../../platform/common/types';
 import { noop } from '../../../platform/common/utils/misc';
 import { PlotViewHandler } from './plotViewHandler';
 import { IPlotSaveHandler } from './types';
+import { logger } from '../../../platform/logging';
+import { DataScience } from '../../../platform/common/utils/localize';
 
 export type OpenImageInPlotViewer = {
     type: 'openImageInPlotViewer';
@@ -48,15 +50,20 @@ export class RendererCommunication implements IExtensionSyncActivationService, I
             onDidReceiveMessage: Event<{ editor: NotebookEditor; message: OpenImageInPlotViewer | SaveImageAs }>;
         };
         api.onDidReceiveMessage(
-            ({ editor, message }) => {
+            async ({ editor, message }) => {
                 const document = editor.notebook || window.activeNotebookEditor?.notebook;
                 if (!document) {
                     return;
                 }
-                if (message.type === 'saveImageAs') {
-                    this.plotSaveHandler.savePlot(document, message.outputId, message.mimeType).catch(noop);
-                } else if (message.type === 'openImageInPlotViewer') {
-                    this.plotViewHandler.openPlot(document, message.outputId).catch(noop);
+                try {
+                    if (message.type === 'saveImageAs') {
+                        await this.plotSaveHandler.savePlot(document, message.outputId, message.mimeType);
+                    } else if (message.type === 'openImageInPlotViewer') {
+                        await this.plotViewHandler.openPlot(document, message.outputId);
+                    }
+                } catch (ex) {
+                    logger.error(ex);
+                    window.showErrorMessage(DataScience.exportImageFailed(ex.message)).then(noop, noop);
                 }
             },
             this,