forked from enviPath/enviPy
Tobias O
1a2c9bb543
This PR moves all the collection pages into the new UI in a rough push. I did not put the same amount of care into these as into search, index, and predict. ## Major changes - All modals are now migrated to a state based alpine.js implementation. - jQuery is no longer present in the base layout; ajax is replace by native fetch api - most of the pps.js is now obsolte (as I understand it; the code is not referenced any more @jebus please double check) - in-memory pagination for large result lists (set to 50; we can make that configurable later; performance degrades at around 1k) stukk a bit rough tracked in #235 ## Minor things - Sarch and index also use alpine now - The loading spinner is now CSS animated (not sure if it currently gets correctly called) ## Not done - Ihave not even cheked the admin pages. Not sure If these need migrations - The temporary migration pages still use the old template. Not sure what is supposed to happen with those? @jebus ## What I did to test - opend all pages in browse, and user ; plus all pages reachable from there. - Interacted and tested the functionality of each modal superfically with exception of the API key modal (no functional test). --- This PR is massive sorry for that; just did not want to push half-brokenn state. @jebus @liambrydon I would be glad if you could click around and try to break it :) Finally closes #133 Co-authored-by: Tim Lorsbach <tim@lorsba.ch> Reviewed-on: enviPath/enviPy#236 Co-authored-by: Tobias O <tobias.olenyi@envipath.com> Co-committed-by: Tobias O <tobias.olenyi@envipath.com>
338 lines
10 KiB
HTML
338 lines
10 KiB
HTML
<dialog
|
|
id="new_model_modal"
|
|
class="modal"
|
|
x-data="{
|
|
isSubmitting: false,
|
|
modelType: '',
|
|
buildAppDomain: false,
|
|
|
|
reset() {
|
|
this.isSubmitting = false;
|
|
this.modelType = '';
|
|
this.buildAppDomain = false;
|
|
},
|
|
|
|
get showMlrr() {
|
|
return this.modelType === 'mlrr';
|
|
},
|
|
|
|
get showRbrr() {
|
|
return this.modelType === 'rbrr';
|
|
},
|
|
|
|
get showEnviformer() {
|
|
return this.modelType === 'enviformer';
|
|
},
|
|
|
|
submit(formId) {
|
|
const form = document.getElementById(formId);
|
|
if (form && form.checkValidity()) {
|
|
this.isSubmitting = true;
|
|
form.submit();
|
|
} else if (form) {
|
|
form.reportValidity();
|
|
}
|
|
}
|
|
}"
|
|
@close="reset()"
|
|
>
|
|
<div class="modal-box max-w-3xl">
|
|
<!-- Header -->
|
|
<h3 class="text-lg font-bold">New Model</h3>
|
|
|
|
<!-- Close button (X) -->
|
|
<form method="dialog">
|
|
<button
|
|
class="btn btn-sm btn-circle btn-ghost absolute top-2 right-2"
|
|
:disabled="isSubmitting"
|
|
>
|
|
✕
|
|
</button>
|
|
</form>
|
|
|
|
<!-- Body -->
|
|
<div class="py-4">
|
|
<form
|
|
id="new_model_form"
|
|
accept-charset="UTF-8"
|
|
action="{{ meta.current_package.url }}/model"
|
|
method="post"
|
|
>
|
|
{% csrf_token %}
|
|
<div class="alert alert-info mb-4">
|
|
<span>
|
|
Create a new Model to limit the number of degradation products in
|
|
the prediction. You just need to set a name and the packages you
|
|
want the object to be based on. There are multiple types of models
|
|
available. For additional information have a look at our
|
|
<a
|
|
target="_blank"
|
|
href="https://wiki.envipath.org/index.php/relative-reasoning"
|
|
class="link"
|
|
>wiki >></a
|
|
>
|
|
</span>
|
|
</div>
|
|
|
|
<!-- Name -->
|
|
<div class="form-control mb-3">
|
|
<label class="label" for="model-name">
|
|
<span class="label-text">Name</span>
|
|
</label>
|
|
<input
|
|
id="model-name"
|
|
name="model-name"
|
|
class="input input-bordered w-full"
|
|
placeholder="Name"
|
|
required
|
|
/>
|
|
</div>
|
|
|
|
<!-- Description -->
|
|
<div class="form-control mb-3">
|
|
<label class="label" for="model-description">
|
|
<span class="label-text">Description</span>
|
|
</label>
|
|
<input
|
|
id="model-description"
|
|
name="model-description"
|
|
class="input input-bordered w-full"
|
|
placeholder="Description"
|
|
/>
|
|
</div>
|
|
|
|
<!-- Model Type -->
|
|
<div class="form-control mb-3">
|
|
<label class="label" for="model-type">
|
|
<span class="label-text">Model Type</span>
|
|
</label>
|
|
<select
|
|
id="model-type"
|
|
name="model-type"
|
|
class="select select-bordered w-full"
|
|
x-model="modelType"
|
|
required
|
|
>
|
|
<option value="" disabled selected>Select Model Type</option>
|
|
{% for k, v in model_types.items %}
|
|
<option value="{{ v }}">{{ k }}</option>
|
|
{% endfor %}
|
|
</select>
|
|
</div>
|
|
|
|
<!-- Rule Packages (MLRR, RBRR) -->
|
|
<div class="form-control mb-3" x-show="showMlrr || showRbrr" x-cloak>
|
|
<label class="label" for="model-rule-packages">
|
|
<span class="label-text">Rule Packages</span>
|
|
</label>
|
|
<select
|
|
id="model-rule-packages"
|
|
name="model-rule-packages"
|
|
class="select select-bordered w-full h-32"
|
|
multiple
|
|
>
|
|
<optgroup label="Reviewed Packages">
|
|
{% for obj in meta.readable_packages %}
|
|
{% if obj.reviewed %}
|
|
<option value="{{ obj.url }}">{{ obj.name|safe }}</option>
|
|
{% endif %}
|
|
{% endfor %}
|
|
</optgroup>
|
|
<optgroup label="Unreviewed Packages">
|
|
{% for obj in meta.readable_packages %}
|
|
{% if not obj.reviewed %}
|
|
<option value="{{ obj.url }}">{{ obj.name|safe }}</option>
|
|
{% endif %}
|
|
{% endfor %}
|
|
</optgroup>
|
|
</select>
|
|
<label class="label">
|
|
<span class="label-text-alt">Hold Ctrl/Cmd to select multiple</span>
|
|
</label>
|
|
</div>
|
|
|
|
<!-- Data Packages (MLRR, RBRR, Enviformer) -->
|
|
<div
|
|
class="form-control mb-3"
|
|
x-show="showMlrr || showRbrr || showEnviformer"
|
|
x-cloak
|
|
>
|
|
<label class="label" for="model-data-packages">
|
|
<span class="label-text">Data Packages</span>
|
|
</label>
|
|
<select
|
|
id="model-data-packages"
|
|
name="model-data-packages"
|
|
class="select select-bordered w-full h-32"
|
|
multiple
|
|
>
|
|
<optgroup label="Reviewed Packages">
|
|
{% for obj in meta.readable_packages %}
|
|
{% if obj.reviewed %}
|
|
<option value="{{ obj.url }}">{{ obj.name|safe }}</option>
|
|
{% endif %}
|
|
{% endfor %}
|
|
</optgroup>
|
|
<optgroup label="Unreviewed Packages">
|
|
{% for obj in meta.readable_packages %}
|
|
{% if not obj.reviewed %}
|
|
<option value="{{ obj.url }}">{{ obj.name|safe }}</option>
|
|
{% endif %}
|
|
{% endfor %}
|
|
</optgroup>
|
|
</select>
|
|
<label class="label">
|
|
<span class="label-text-alt">Hold Ctrl/Cmd to select multiple</span>
|
|
</label>
|
|
</div>
|
|
|
|
<!-- Fingerprinter (MLRR) -->
|
|
<div class="form-control mb-3" x-show="showMlrr" x-cloak>
|
|
<label class="label" for="model-fingerprinter">
|
|
<span class="label-text">Fingerprinter</span>
|
|
</label>
|
|
<select
|
|
id="model-fingerprinter"
|
|
name="model-fingerprinter"
|
|
class="select select-bordered w-full h-32"
|
|
multiple
|
|
>
|
|
<option value="MACCS" selected>MACCS Fingerprinter</option>
|
|
{% if meta.enabled_features.PLUGINS and additional_descriptors %}
|
|
<optgroup label="Additional Fingerprinter / Descriptor">
|
|
{% for k, v in additional_descriptors.items %}
|
|
<option value="{{ v }}">{{ k }}</option>
|
|
{% endfor %}
|
|
</optgroup>
|
|
{% endif %}
|
|
</select>
|
|
<label class="label">
|
|
<span class="label-text-alt">Hold Ctrl/Cmd to select multiple</span>
|
|
</label>
|
|
</div>
|
|
|
|
<!-- Threshold (MLRR, Enviformer) -->
|
|
<div
|
|
class="form-control mb-3"
|
|
x-show="showMlrr || showEnviformer"
|
|
x-cloak
|
|
>
|
|
<label class="label" for="model-threshold">
|
|
<span class="label-text">Threshold</span>
|
|
</label>
|
|
<input
|
|
type="number"
|
|
min="0"
|
|
max="1"
|
|
step="0.05"
|
|
value="0.5"
|
|
id="model-threshold"
|
|
name="model-threshold"
|
|
class="input input-bordered w-full"
|
|
/>
|
|
</div>
|
|
|
|
<!-- Applicability Domain (MLRR) -->
|
|
{% if meta.enabled_features.APPLICABILITY_DOMAIN %}
|
|
<div x-show="showMlrr" x-cloak>
|
|
<div class="form-control mb-3">
|
|
<label class="label cursor-pointer justify-start gap-3">
|
|
<input
|
|
type="checkbox"
|
|
id="build-app-domain"
|
|
name="build-app-domain"
|
|
class="checkbox"
|
|
x-model="buildAppDomain"
|
|
/>
|
|
<span class="label-text"
|
|
>Also build an Applicability Domain?</span
|
|
>
|
|
</label>
|
|
</div>
|
|
|
|
<div x-show="buildAppDomain" x-cloak class="ml-4 space-y-3">
|
|
<div class="form-control">
|
|
<label class="label" for="num-neighbors">
|
|
<span class="label-text">Number of Neighbors</span>
|
|
</label>
|
|
<input
|
|
id="num-neighbors"
|
|
name="num-neighbors"
|
|
type="number"
|
|
class="input input-bordered w-full"
|
|
value="5"
|
|
step="1"
|
|
min="0"
|
|
max="10"
|
|
/>
|
|
</div>
|
|
|
|
<div class="form-control">
|
|
<label class="label" for="local-compatibility-threshold">
|
|
<span class="label-text">Local Compatibility Threshold</span>
|
|
</label>
|
|
<input
|
|
id="local-compatibility-threshold"
|
|
name="local-compatibility-threshold"
|
|
type="number"
|
|
class="input input-bordered w-full"
|
|
value="0.5"
|
|
step="0.01"
|
|
min="0"
|
|
max="1"
|
|
/>
|
|
</div>
|
|
|
|
<div class="form-control">
|
|
<label class="label" for="reliability-threshold">
|
|
<span class="label-text">Reliability Threshold</span>
|
|
</label>
|
|
<input
|
|
id="reliability-threshold"
|
|
name="reliability-threshold"
|
|
type="number"
|
|
class="input input-bordered w-full"
|
|
value="0.5"
|
|
step="0.01"
|
|
min="0"
|
|
max="1"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
</form>
|
|
</div>
|
|
|
|
<!-- Footer -->
|
|
<div class="modal-action">
|
|
<button
|
|
type="button"
|
|
class="btn"
|
|
onclick="this.closest('dialog').close()"
|
|
:disabled="isSubmitting"
|
|
>
|
|
Cancel
|
|
</button>
|
|
<button
|
|
type="button"
|
|
class="btn btn-primary"
|
|
@click="submit('new_model_form')"
|
|
:disabled="isSubmitting"
|
|
>
|
|
<span x-show="!isSubmitting">Submit</span>
|
|
<span
|
|
x-show="isSubmitting"
|
|
class="loading loading-spinner loading-sm"
|
|
></span>
|
|
<span x-show="isSubmitting">Creating...</span>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Backdrop -->
|
|
<form method="dialog" class="modal-backdrop">
|
|
<button :disabled="isSubmitting">close</button>
|
|
</form>
|
|
</dialog>
|