[Fix] Remove all Scenarios, catch empty SMILES, prevent default Package delete (#134)

Co-authored-by: Tim Lorsbach <tim@lorsba.ch>
Reviewed-on: enviPath/enviPy#134
This commit is contained in:
2025-09-30 19:10:57 +13:00
parent b757a07f91
commit 3f5bb76633
9 changed files with 215 additions and 53 deletions

View File

@ -6,8 +6,7 @@
<h4 class="alert-heading">{{ error_message }}</h4>
<hr>
<p class="mb-0">
{{ error_detail }}<br>
The error was logged and will be investigated.
{{ error_detail }}
</p>
</div>

View File

@ -89,7 +89,7 @@
<div class="collapse navbar-collapse collapse-framework navbar-collapse-framework" id="navbarCollapse">
<ul class="nav navbar-nav navbar-nav-framework">
<li>
<a class="button" data-toggle="modal" data-target="#predict_modal">
<a href="#" data-toggle="modal" data-target="#predict_modal">
Predict Pathway
</a>
</li>

View File

@ -103,6 +103,7 @@
var textSmiles = $('#index-form-text-input').val().trim();
if (textSmiles === '') {
$(this).prop("disabled", false);
return;
}

View File

@ -64,6 +64,9 @@
$('#set_scenario_modal_form_submit').on('click', function (e) {
e.preventDefault();
if ($('##scenario-select').val().length == 0) {
$('##scenario-select').val([''])
}
$('#set_scenario_modal_form').submit();
});
});

View File

@ -315,12 +315,18 @@
$("#predict-button").on("click", function (e) {
e.preventDefault();
clear("predictResultTable");
data = {
"smiles": $("#smiles-to-predict").val(),
"classify": "ILikeCats!"
}
clear("predictResultTable");
if (data["smiles"].trim() === "") {
$("#predictResultTable").addClass("alert alert-danger");
$("#predictResultTable").append("Please enter a SMILES string to predict!");
return;
}
makeLoadingGif("#predictLoading", "{% static '/images/wait.gif' %}");
$.ajax({
@ -332,17 +338,17 @@
$("#predictLoading").empty();
handlePredictionResponse(data);
} catch (error) {
console.log("Error");
$("#predictLoading").empty();
$("#predictResultTable").addClass("alert alert-danger");
$("#predictResultTable").append("Error while processing request :/");
$("#predictResultTable").append("Error while processing response :/");
}
},
error: function (jqXHR, textStatus, errorThrown) {
error: function (jqXHR, textStatus, errorThrown, x) {
$("#predictLoading").empty();
$("#predictResultTable").addClass("alert alert-danger");
$("#predictResultTable").append("Error while processing request :/");
}
$("#predictResultTable").append(jqXHR.responseJSON.error);
},
});
});
}
@ -351,12 +357,20 @@
$("#assess-button").on("click", function (e) {
e.preventDefault();
clear("appDomainAssessmentResultTable");
data = {
"smiles": $("#smiles-to-assess").val(),
"app-domain-assessment": "ILikeCats!"
}
clear("appDomainAssessmentResultTable");
if (data["smiles"].trim() === "") {
$("#appDomainAssessmentResultTable").addClass("alert alert-danger");
$("#appDomainAssessmentResultTable").append("Please enter a SMILES string to predict!");
return;
}
makeLoadingGif("#appDomainLoading", "{% static '/images/wait.gif' %}");
$.ajax({
@ -369,16 +383,15 @@
handleAssessmentResponse("{% url 'depict' %}", data);
console.log(data);
} catch (error) {
console.log("Error");
$("#appDomainLoading").empty();
$("#appDomainAssessmentResultTable").addClass("alert alert-danger");
$("#appDomainAssessmentResultTable").append("Error while processing request :/");
$("#appDomainAssessmentResultTable").append("Error while processing response :/");
}
},
error: function (jqXHR, textStatus, errorThrown) {
$("#appDomainLoading").empty();
$("#appDomainAssessmentResultTable").addClass("alert alert-danger");
$("#appDomainAssessmentResultTable").append("Error while processing request :/");
$("#appDomainAssessmentResultTable").append(jqXHR.responseJSON.error);
}
});
});