forked from enviPath/enviPy
[Feature] Modern UI roll out (#236)
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>
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
{% extends "framework.html" %}
|
||||
{% extends "framework_modern.html" %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
@ -10,359 +10,243 @@
|
||||
{% include "modals/objects/generic_delete_modal.html" %}
|
||||
{% endblock action_modals %}
|
||||
|
||||
<div class="panel-group" id="rule-detail">
|
||||
<div class="panel panel-default">
|
||||
<div
|
||||
class="panel-heading"
|
||||
id="headingPanel"
|
||||
style="font-size:2rem;height: 46px"
|
||||
>
|
||||
{{ rule.name|safe }}
|
||||
<div
|
||||
id="actionsButton"
|
||||
style="float: right;font-weight: normal;font-size: medium;position: relative; top: 50%; transform: translateY(-50%);z-index:100;display: none;"
|
||||
class="dropdown"
|
||||
>
|
||||
<a
|
||||
href="#"
|
||||
class="dropdown-toggle"
|
||||
data-toggle="dropdown"
|
||||
role="button"
|
||||
aria-haspopup="true"
|
||||
aria-expanded="false"
|
||||
><span class="glyphicon glyphicon-wrench"></span> Actions
|
||||
<span class="caret"></span><span style="padding-right:1em"></span
|
||||
></a>
|
||||
<ul id="actionsList" class="dropdown-menu">
|
||||
{% block actions %}
|
||||
{% include "actions/objects/rule.html" %}
|
||||
{% endblock %}
|
||||
<div class="space-y-2 p-4">
|
||||
<!-- Header Section -->
|
||||
<div class="card bg-base-100">
|
||||
<div class="card-body">
|
||||
<div class="flex items-center justify-between">
|
||||
<h2 class="card-title text-2xl">{{ rule.name }}</h2>
|
||||
<div id="actionsButton" class="dropdown dropdown-end hidden">
|
||||
<div tabindex="0" role="button" class="btn btn-ghost btn-sm">
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
width="16"
|
||||
height="16"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
stroke-width="2"
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
class="lucide lucide-wrench"
|
||||
>
|
||||
<path
|
||||
d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z"
|
||||
/>
|
||||
</svg>
|
||||
Actions
|
||||
</div>
|
||||
<ul
|
||||
tabindex="-1"
|
||||
class="dropdown-content menu bg-base-100 rounded-box z-50 w-52 p-2"
|
||||
>
|
||||
{% block actions %}
|
||||
{% include "actions/objects/rule.html" %}
|
||||
{% endblock %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<p class="mt-2">{{ rule.description }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if rule.aliases %}
|
||||
<!-- Aliases -->
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">Aliases</div>
|
||||
<div class="collapse-content">
|
||||
<ul class="menu bg-base-100 rounded-box">
|
||||
{% for alias in rule.aliases %}
|
||||
<li><a class="hover:bg-base-200">{{ alias }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<p>{{ rule.description|safe }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if rule.aliases %}
|
||||
<!-- Aliases -->
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-aliases-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-aliases"
|
||||
>Aliases</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="rule-aliases" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
{% for alias in rule.aliases %}
|
||||
<a class="list-group-item">{{ alias }}</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<!-- Image Representation -->
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">Image Representation</div>
|
||||
<div class="collapse-content">
|
||||
<div class="flex justify-center">{{ rule.as_svg|safe }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Representation -->
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-image-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-image"
|
||||
>Image Representation</a
|
||||
>
|
||||
</h4>
|
||||
<!-- SMIRKS -->
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">
|
||||
SMIRKS Representation
|
||||
</div>
|
||||
<div id="rule-image" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<div id="image-div" align="center">{{ rule.as_svg|safe }}</div>
|
||||
</div>
|
||||
<div class="collapse-content">
|
||||
<p>{{ rule.smirks }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- SMIRKS -->
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-smirks-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-smirks"
|
||||
>SMIRKS Representation</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="rule-smirks" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<p>{{ rule.smirks }}</p>
|
||||
</div>
|
||||
<!-- Reactants SMARTS -->
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">Reactant SMARTS</div>
|
||||
<div class="collapse-content">
|
||||
<p>{{ rule.reactants_smarts }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Reactants SMARTS -->
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-reactants-smarts-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-reactants-smarts"
|
||||
>Reactant SMARTS</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="rule-reactants-smarts" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<p>{{ rule.reactants_smarts }}</p>
|
||||
<!-- Reactant Filter SMARTS -->
|
||||
{% if rule.reactant_filter_smarts %}
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">
|
||||
Reactant Filter SMARTS
|
||||
</div>
|
||||
<div class="collapse-content">
|
||||
<p>{{ rule.reactant_filter_smarts }}</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Reactant Filter SMARTS -->
|
||||
{% if rule.reactant_filter_smarts %}
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-reactant-filter-smarts-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-reactant-filter-smarts"
|
||||
>Reactant Filter SMARTS</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div
|
||||
id="rule-reactant-filter-smarts"
|
||||
class="panel-collapse in collapse"
|
||||
>
|
||||
<div class="panel-body list-group-item">
|
||||
<p>{{ rule.reactant_filter_smarts }}</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Products SMARTS -->
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-products-smarts-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-products-smarts"
|
||||
>Reactant SMARTS</a
|
||||
>
|
||||
</h4>
|
||||
<!-- Products SMARTS -->
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">Products SMARTS</div>
|
||||
<div class="collapse-content">
|
||||
<p>{{ rule.products_smarts }}</p>
|
||||
</div>
|
||||
<div id="rule-products-smarts" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<p>{{ rule.products_smarts }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Product Filter SMARTS -->
|
||||
{% if rule.product_filter_smarts %}
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">
|
||||
Product Filter SMARTS
|
||||
</div>
|
||||
<div class="collapse-content">
|
||||
<p>{{ rule.product_filter_smarts }}</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Product Filter SMARTS -->
|
||||
{% if rule.product_filter_smarts %}
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-product-filter-smarts-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-product-filter-smarts"
|
||||
>Product Filter SMARTS</a
|
||||
>
|
||||
</h4>
|
||||
<!-- Included in Composite Rules -->
|
||||
{% if rule.parallelrule_set.all %}
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">
|
||||
Included in Composite Rules
|
||||
</div>
|
||||
<div id="rule-product-filter-smarts" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<p>{{ rule.product_filter_smarts }}</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Included in Composite Rules -->
|
||||
{% if rule.parallelrule_set.all %}
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-composite-rule-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-composite-rule"
|
||||
>Included in Composite Rules</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="rule-composite-rule" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<div class="collapse-content">
|
||||
<ul class="menu bg-base-100 rounded-box">
|
||||
{% for cr in rule.parallelrule_set.all %}
|
||||
<a class="list-group-item" href="{{ cr.url }}"
|
||||
>{{ cr.name|safe }}</a
|
||||
>
|
||||
<li>
|
||||
<a href="{{ cr.url }}" class="hover:bg-base-200"
|
||||
>{{ cr.name }}</a
|
||||
>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Scenarios -->
|
||||
{% if rule.scenarios.all %}
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-scenario-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-scenario"
|
||||
>Scenarios</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="rule-scenario" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<!-- Scenarios -->
|
||||
{% if rule.scenarios.all %}
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">Scenarios</div>
|
||||
<div class="collapse-content">
|
||||
<ul class="menu bg-base-100 rounded-box">
|
||||
{% for s in rule.scenarios.all %}
|
||||
<a class="list-group-item" href="{{ s.url }}"
|
||||
>{{ s.name|safe }}</a
|
||||
>
|
||||
<li>
|
||||
<a href="{{ s.url }}" class="hover:bg-base-200">{{ s.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Reactions -->
|
||||
{% if rule.related_reactions %}
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-reaction-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-reaction"
|
||||
>Reactions</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="rule-reaction" class="panel-collapse collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<!-- Reactions -->
|
||||
{% if rule.related_reactions %}
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" />
|
||||
<div class="collapse-title text-xl font-medium">Reactions</div>
|
||||
<div class="collapse-content">
|
||||
<ul class="menu bg-base-100 rounded-box">
|
||||
{% for r in rule.related_reactions %}
|
||||
<a class="list-group-item" href="{{ r.url }}"
|
||||
>{{ r.name|safe }}</a
|
||||
>
|
||||
<li>
|
||||
<a href="{{ r.url }}" class="hover:bg-base-200">{{ r.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Pathways -->
|
||||
{% if rule.related_pathways %}
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-pathway-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-pathway"
|
||||
>Pathways</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="rule-pathway" class="panel-collapse collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
<!-- Pathways -->
|
||||
{% if rule.related_pathways %}
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" />
|
||||
<div class="collapse-title text-xl font-medium">Pathways</div>
|
||||
<div class="collapse-content">
|
||||
<ul class="menu bg-base-100 rounded-box">
|
||||
{% for r in rule.related_pathways %}
|
||||
<a class="list-group-item" href="{{ r.url }}"
|
||||
>{{ r.name|safe }}</a
|
||||
>
|
||||
<li>
|
||||
<a href="{{ r.url }}" class="hover:bg-base-200">{{ r.name }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if rule.enzymelinks %}
|
||||
<!-- EC Numbers -->
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="rule-ec-numbers-link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#rule-detail"
|
||||
href="#rule-ec-numbers"
|
||||
>EC Numbers</a
|
||||
>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="rule-ec-numbers" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
{% if rule.enzymelinks %}
|
||||
<!-- EC Numbers -->
|
||||
<div class="collapse-arrow bg-base-200 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-xl font-medium">EC Numbers</div>
|
||||
<div class="collapse-content">
|
||||
<div class="space-y-2">
|
||||
{% for k, v in rule.get_grouped_enzymelinks.items %}
|
||||
<div
|
||||
class="panel panel-default panel-heading list-group-item"
|
||||
style="background-color:silver"
|
||||
>
|
||||
<h4 class="panel-title">
|
||||
<a
|
||||
id="{{ k|slugify }}_Link"
|
||||
data-toggle="collapse"
|
||||
data-parent="#{{ k|slugify }}_Accordion"
|
||||
href="#{{ k|slugify }}"
|
||||
>
|
||||
{{ k }}
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="{{ k|slugify }}" class="panel-collapse in collapse">
|
||||
<div class="panel-body list-group-item">
|
||||
{% for enzyme in v %}
|
||||
<a class="list-group-item" href="{{ enzyme.url }}">
|
||||
{{ enzyme.ec_number }}
|
||||
<div style="position:absolute;bottom:10px;left:100px;">
|
||||
{{ enzyme.name }}
|
||||
</div>
|
||||
<div style="float:right;">
|
||||
{{ enzyme.linking_method }}
|
||||
</div>
|
||||
</a>
|
||||
{% endfor %}
|
||||
<div class="collapse-arrow bg-base-100 collapse">
|
||||
<input type="checkbox" checked />
|
||||
<div class="collapse-title text-lg font-medium">{{ k }}</div>
|
||||
<div class="collapse-content">
|
||||
<ul class="menu bg-base-200 rounded-box">
|
||||
{% for enzyme in v %}
|
||||
<li>
|
||||
<a href="{{ enzyme.url }}" class="hover:bg-base-300">
|
||||
<div class="flex w-full items-center justify-between">
|
||||
<span>{{ enzyme.ec_number }}</span>
|
||||
<span class="text-sm opacity-70"
|
||||
>{{ enzyme.linking_method }}</span
|
||||
>
|
||||
</div>
|
||||
<div class="text-sm opacity-60">
|
||||
{{ enzyme.name }}
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// Show actions button if there are actions
|
||||
document.addEventListener("DOMContentLoaded", function () {
|
||||
const actionsButton = document.getElementById("actionsButton");
|
||||
const actionsList = actionsButton?.querySelector("ul");
|
||||
if (actionsList && actionsList.children.length > 0) {
|
||||
actionsButton?.classList.remove("hidden");
|
||||
}
|
||||
});
|
||||
</script>
|
||||
{% endblock content %}
|
||||
|
||||
Reference in New Issue
Block a user