Skip to content

Commit 2d46a9d

Browse files
committed
Rework the error handling.
Remove the plural on the PGML convert error as was done on the PG side as there is only ever one error. Remove the `<pre><code>` wrapper. That is not right for this type of message.
1 parent d6ef33e commit 2d46a9d

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

htdocs/js/PGProblemEditor/pgproblemeditor.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,15 +272,12 @@
272272
.then((data) => {
273273
if (data.error) throw new Error(data.error);
274274
if (!data.result_data) throw new Error('An invalid response was received.');
275-
if (data.result_data.errors) {
275+
if (data.result_data.error) {
276276
renderArea.innerHTML =
277277
'<div class="alert alert-danger p-1 m-2">' +
278-
'<p class="fw-bold">PGML conversion errors:</p>' +
279-
'<pre><code>' +
280-
data.result_data.errors
281-
.replace(/^[\s\S]*Begin Error Output Stream\n\n/, '')
282-
.replace(/\n\d*: To save a full \.LOG file rerun with -g/, '') +
283-
'</code></pre>';
278+
'<p class="fw-bold">PGML conversion error:</p>' +
279+
data.result_data.error +
280+
'</div>';
284281

285282
showMessage('Errors occurred when converting code to PGML.', false);
286283
return;

0 commit comments

Comments
 (0)