Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions htdocs/js/PGProblemEditor/pgproblemeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,13 +272,27 @@
.then((data) => {
if (data.error) throw new Error(data.error);
if (!data.result_data) throw new Error('An invalid response was received.');
if (data.result_data.errors) {
renderArea.innerHTML =
'<div class="alert alert-danger p-1 m-2">' +
'<p class="fw-bold">PGML conversion errors:</p>' +
'<pre><code>' +
data.result_data.errors
.replace(/^[\s\S]*Begin Error Output Stream\n\n/, '')
.replace(/\n\d*: To save a full \.LOG file rerun with -g/, '') +
'</code></pre>';

showMessage('Errors occurred when converting code to PGML.', false);
return;
}
if (request_object.pgCode === data.result_data.pgmlCode) {
showMessage('There were no changes to the code.', true);
} else {
if (webworkConfig?.pgCodeMirror) webworkConfig.pgCodeMirror.source = data.result_data.pgmlCode;
else document.getElementById('problemContents').value = data.result_data.pgmlCode;
saveTempFile();
showMessage('Successfully converted code to PGML', true);
if (!(renderArea.firstChild instanceof HTMLIFrameElement)) render();
}
})
.catch((err) => showMessage(`Error: ${err?.message ?? err}`));
Expand Down
4 changes: 1 addition & 3 deletions lib/WebworkWebservice/ProblemActions.pm
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,11 @@ sub tidyPGCode {

sub convertCodeToPGML {
my ($invocant, $self, $params) = @_;
my $code = $params->{pgCode};

return {
ra_out => { pgmlCode => convertToPGML($code) },
ra_out => convertToPGML($params->{pgCode}),
text => 'Converted to PGML'
};

}

sub runPGCritic {
Expand Down