add spinner when receiving running state + fix stream in details for pending state

This commit is contained in:
rmanach 2023-09-26 13:28:59 +02:00
parent 57750c56d1
commit 981555bcf3
2 changed files with 16 additions and 13 deletions

View File

@ -36,10 +36,15 @@ var start = function (url) {
innerBtn.setAttribute("type", "button"); innerBtn.setAttribute("type", "button");
innerBtn.className = "btn btn-primary btn-sm" innerBtn.className = "btn btn-primary btn-sm"
innerSpan = document.createElement("span"); var innerSpan = document.createElement("span");
innerSpan.setAttribute("role", "status"); innerSpan.setAttribute("role", "status");
innerSpan.innerHTML = "Deploying..."; innerSpan.innerHTML = "Deploying...";
var innerSpinner = document.createElement("span");
innerSpinner.className = "spinner-border spinner-border-sm";
innerSpinner.setAttribute("aria-hidden", "true");
innerBtn.appendChild(innerSpinner);
innerBtn.appendChild(innerSpan); innerBtn.appendChild(innerSpan);
button.innerHTML = ""; button.innerHTML = "";

View File

@ -4,21 +4,19 @@
{% block title %} Deployment details: {{ deployment.name }} {% endblock %} {% block title %} Deployment details: {{ deployment.name }} {% endblock %}
{% if deployment.status == "RUNNING" %} {% block bodyattr %}
{% block bodyattr %} {% if deployment.status == "RUNNING" or deployment.status == "PENDING" %}
{% if deployment.status == "RUNNING" %}
onload="start('{{ url|safe }}');" onload="start('{{ url|safe }}');"
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block headscript %} {% block headscript %}
{% if deployment.status == "RUNNING" or deployment.status == "PENDING" %} {% if deployment.status == "RUNNING" or deployment.status == "PENDING" %}
<script src="{% static 'django_eventstream/json2.js' %}"></script> <script src="{% static 'django_eventstream/json2.js' %}"></script>
<script src="{% static 'django_eventstream/eventsource.min.js' %}"></script> <script src="{% static 'django_eventstream/eventsource.min.js' %}"></script>
<script src="{% static 'django_eventstream/reconnecting-eventsource.js' %}"></script> <script src="{% static 'django_eventstream/reconnecting-eventsource.js' %}"></script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% endif %}
{% block content %} {% block content %}
<div class="container-fluid"> <div class="container-fluid">