From c1bb6f89f2f0b0f69731c90cfc68af5aa80cf814 Mon Sep 17 00:00:00 2001
From: Rafael JPD <rafael.pezzuto@gmail.com>
Date: Wed, 10 Nov 2021 13:08:07 -0300
Subject: [PATCH 1/3] =?UTF-8?q?melhora=20fun=C3=A7=C3=A3o=20para=20esconde?=
 =?UTF-8?q?r=20e=20exibir=20git=20loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/core/static/js/main.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/core/static/js/main.js b/app/core/static/js/main.js
index 39745a1..5e75dec 100644
--- a/app/core/static/js/main.js
+++ b/app/core/static/js/main.js
@@ -19,18 +19,6 @@ function createMessage(msg, alert_class){
     return divAlert;
 }
 
-function ingressPackageDownloadToggleSpinner(){
-    var btnSearchPackage = document.getElementById('btnSearchPackage');
-    var divSpinner = document.getElementById('searchPackageLoading');
-    if (divSpinner.style.display == "none") {
-        divSpinner.style.display = 'block';
-        btnSearchPackage.setAttribute('disabled', 'disabled');
-    } else {
-        divSpinner.style.display = 'none';
-        btnSearchPackage.removeAttribute('disabled');
-    }
-}
-
 function ingressPackageDownloadCreateTable(data){
     tableBody = document.getElementById('resultSearchPackagesTableBody')
 
@@ -66,3 +54,13 @@ function ingressPackageDownloadCreateTable(data){
         }
     }
 }
+
+function showLoader(loader, button){
+    loader.style.display = 'block';
+    button.setAttribute('disabled', 'disabled');
+}
+
+function hideLoader(loader, button){
+    loader.style.display = 'none';
+    button.removeAttribute('disabled');
+}

From 6b56d390774267402e7ee4deb60080bc75a165fc Mon Sep 17 00:00:00 2001
From: Rafael JPD <rafael.pezzuto@gmail.com>
Date: Wed, 10 Nov 2021 13:08:56 -0300
Subject: [PATCH 2/3] =?UTF-8?q?melhora=20nomes=20de=20vari=C3=A1veis=20em?=
 =?UTF-8?q?=20js=20de=20template?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/core/templates/ingress/package_download.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/core/templates/ingress/package_download.html b/app/core/templates/ingress/package_download.html
index f205bf7..cc7bce8 100644
--- a/app/core/templates/ingress/package_download.html
+++ b/app/core/templates/ingress/package_download.html
@@ -22,11 +22,11 @@ <h1 class="h4 pt-5">{% trans 'Search package' %}</h1>
                         <label for="pid" class="form-label">{% trans 'Document identifier' %}</label>
                         <input required type="text" name="pid" autofocus id="pid" class="form-control" placeholder="{% trans 'Enter a document identifier' %}" value="{{ pid }}">
                     </div>
-                    <button id="btnSearchPackage" type="submit" class="btn btn-primary">{% trans 'Search' %}</button>
+                    <button id="buttonSearch" type="submit" class="btn btn-primary">{% trans 'Search' %}</button>
                 </form>
             </div>
         </div>
-        <div id='searchPackageLoading' style="display: none;" role="status">
+        <div id='divLoader' style="display: none;" role="status">
             <div class="spinner-border text-primary">
                 <span class="sr-only">{% trans 'Loading' %}...</span>
             </div>

From 3f3fa3c5962e49f59c3811fbefe971cb1d7c2fe6 Mon Sep 17 00:00:00 2001
From: Rafael JPD <rafael.pezzuto@gmail.com>
Date: Wed, 10 Nov 2021 13:09:32 -0300
Subject: [PATCH 3/3] =?UTF-8?q?corrige=20fun=C3=A7=C3=A3o=20para=20atualiz?=
 =?UTF-8?q?ar=20tela=20de=20busca=20(impede=20que=20haja=20repeti=C3=A7?=
 =?UTF-8?q?=C3=A3o=20de=20request)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/ingress/package_download.html   | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/app/core/templates/ingress/package_download.html b/app/core/templates/ingress/package_download.html
index cc7bce8..3f4d9bd 100644
--- a/app/core/templates/ingress/package_download.html
+++ b/app/core/templates/ingress/package_download.html
@@ -52,39 +52,42 @@ <h2 class="h4">{% trans 'Results for document' %} <strong>{{ pid }}</strong></h2
 
 </div>
 <script type="text/javascript">
-    var xhr;
     var checkStatus = '{{ check_status }}';
-    var intervals = {}
+    var loader = document.getElementById('divLoader');
+    var button = document.getElementById('buttonSearch');
+    var requested = false;
+    var timer;
 
-    function update(){
-        xhr = $.ajax({
-            url: '/task/update_status/?task_id={{ task_id }}',
-            type: 'GET',
-            success: function(result) {
-                divSpinner = document.createElement('div');
-                divSpinner.classList.add('spinner-border');
-                divSpinner.setAttribute('role', 'status');
+    function checkTaskStatus() {
+        if (!requested){
+            $.ajax({
+                url: '/task/update_status/?task_id={{ task_id }}',
+                type: 'GET',
+                success: function(result) {
+                    // mostra loader e desativa botão pesquisar
+                    showLoader(loader, button);
 
-                spanLoading = document.createElement('span');
-                spanLoading.classList.add('sr-only');
-                spanLoading.text = "{% trans 'Loading' %}...";
+                    if (result.data && 'doc_pkgs' in result.data) {
+                        // adiciona conteúdo à tabela
+                        ingressPackageDownloadCreateTable(result.data);
 
-                divSpinner.appendChild(spanLoading);
+                        // impede que requisições continuem sendo realizadas
+                        requested = true;
+                        window.clearTimeout(timer);
 
-                $('user-package-download-results').add(divSpinner);
-
-                if (result.data && 'doc_pkgs' in result.data) {
-                    clearInterval(intervals[0]);
-                    ingressPackageDownloadCreateTable(result.data);
-                    ingressPackageDownloadToggleSpinner();
+                        // remove loader e reativa botão pesquisar
+                        hideLoader(loader, button);
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
-    if (checkStatus) {
-        intervals[0] = setInterval(update, 200);
-        ingressPackageDownloadToggleSpinner();
+    if(checkStatus){
+        checkTaskStatus();
+        var timer = setInterval(function(){
+            checkTaskStatus();
+        }, 2000);
     }
 </script>
 {% endblock %}