diff --git a/packages/desktop-gui/cypress/integration/error_message_spec.js b/packages/desktop-gui/cypress/integration/error_message_spec.js index bcb03e418499..8e2135576691 100644 --- a/packages/desktop-gui/cypress/integration/error_message_spec.js +++ b/packages/desktop-gui/cypress/integration/error_message_spec.js @@ -128,17 +128,41 @@ describe('Error Message', function () { this.start() cy.get('.error').contains('ReferenceError: alsdkjf is not defined') - cy.get('details').should('not.have.attr', 'open') - cy.get('details').click().should('have.attr', 'open') - cy.get('summary').should('contain', 'ReferenceError') + cy.get('details.details-body').should('not.have.attr', 'open') + cy.get('details.details-body').click().should('have.attr', 'open') + cy.get('details.details-body > summary').should('contain', 'ReferenceError') }) it('doesn\'t show error details if not provided', function () { cy.stub(this.ipc, 'onProjectError').yields(null, this.err) this.start() + cy.get('details.details-body > summary').should('not.exist') + }) + + it('shows error stack trace if provided', function () { + const err = new Error('foo') + + err.stack = 'bar' + + cy.stub(this.ipc, 'onProjectError').yields(null, err) + this.start() + + cy.get('.error').contains('foo') + cy.get('details.stacktrace').should('not.have.attr', 'open') + cy.get('details.stacktrace').click().should('have.attr', 'open') + cy.get('details.stacktrace').should('contain', 'bar') + }) + + it('doesn\'t show error stack trace if not provided', function () { + const err = new Error() + + delete err.stack + cy.stub(this.ipc, 'onProjectError').yields(null, err) + this.start() + cy.get('.error') - cy.get('summary').should('not.exist') + cy.get('details.stacktrace > summary').should('not.be.visible') }) it('shows abbreviated error details if only one line', function () { @@ -155,7 +179,7 @@ describe('Error Message', function () { this.start() cy.get('.error').contains('ReferenceError: alsdkjf is not defined') - cy.get('summary').should('not.exist') + cy.get('details.details-body > summary').should('not.exist') }) it('opens links outside of electron', function () { @@ -197,7 +221,7 @@ describe('Error Message', function () { this.ipc.openProject.rejects(this.detailsErr) this.start() - cy.get('details').click() + cy.get('details.details-body').click() cy.get('nav').should('be.visible') cy.get('footer').should('be.visible') }) @@ -207,7 +231,7 @@ describe('Error Message', function () { this.ipc.openProject.rejects(this.detailsErr) this.start() - cy.get('details').click() + cy.get('details.details-body').click() cy.contains('Try Again').should('be.visible') cy.get('.full-alert pre').should('have.css', 'overflow', 'auto') }) diff --git a/packages/desktop-gui/cypress/integration/settings_spec.js b/packages/desktop-gui/cypress/integration/settings_spec.js index 1b6fa3b1287b..cc550c815f7f 100644 --- a/packages/desktop-gui/cypress/integration/settings_spec.js +++ b/packages/desktop-gui/cypress/integration/settings_spec.js @@ -490,6 +490,7 @@ describe('Settings', () => { describe('errors', () => { beforeEach(function () { this.err = { + title: 'Foo Title', message: 'Port \'2020\' is already in use.', name: 'Error', port: 2020, @@ -514,11 +515,11 @@ describe('Settings', () => { }) it('displays errors', () => { - cy.contains('Can\'t start server') + cy.contains('Foo Title') }) it('displays config after error is fixed', function () { - cy.contains('Can\'t start server').then(() => { + cy.contains('Foo Title').then(() => { this.ipc.openProject.onCall(1).resolves(this.config) this.ipc.onConfigChanged.yield() diff --git a/packages/desktop-gui/src/lib/ipc.js b/packages/desktop-gui/src/lib/ipc.js index 5eb2512449c4..7866fcfe4e12 100644 --- a/packages/desktop-gui/src/lib/ipc.js +++ b/packages/desktop-gui/src/lib/ipc.js @@ -64,5 +64,6 @@ register('updater:run', false) register('window:open') register('window:close') register('onboarding:closed') +register('set:clipboard:text') export default ipc diff --git a/packages/desktop-gui/src/project/error-message.jsx b/packages/desktop-gui/src/project/error-message.jsx index 20664f59aa2e..ee974370a7a8 100644 --- a/packages/desktop-gui/src/project/error-message.jsx +++ b/packages/desktop-gui/src/project/error-message.jsx @@ -7,6 +7,26 @@ import { configFileFormatted } from '../lib/config-file-formatted' import Markdown from 'markdown-it' +const _copyErrorDetails = (err) => { + let details = [ + `**Message:** ${err.message}`, + ] + + if (err.details) { + details.push(`**Details:** ${err.details}`) + } + + if (err.title) { + details.unshift(`**Title:** ${err.title}`) + } + + if (err.stack2) { + details.push(`**Stack trace:**\n\`\`\`\n${err.stack2}\n\`\`\``) + } + + ipc.setClipboardText(details.join('\n\n')) +} + const md = new Markdown({ html: true, linkify: true, @@ -20,7 +40,7 @@ const ErrorDetails = observer(({ err }) => { if (detailsBody) { return (
-+@@ -61,7 +81,7 @@ class ErrorMessage extends Component {{detailsTitle}
{detailsBody}{' '} - {err.title || 'Can\'t start server'} + {err.title || 'An unexpected error occurred'}
this.errorMessageNode = node} dangerouslySetInnerHTML={{ @@ -76,7 +96,22 @@ class ErrorMessage extends Component {)} + {err.stack2 && ( +To fix, stop the other running process or change the port in {configFileFormatted(this.props.project.configFile)}
++ )} +Stack trace
+{err.stack2}+