Show background job status for all report lists

openSUSE · May 27, 2024 · d1a512c · d1a512c
1 parent 4749388
commit d1a512c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/assets/vue/OpenReviews.vue b/assets/vue/OpenReviews.vue
@@ -168,7 +168,7 @@ export default {
         });
       }
       this.reviews = reviews;
-      setTimeout(() => setupPopover(), 0);
+      setupPopover();
     },
     filterNow() {
       this.cancelApiRefresh();

diff --git a/assets/vue/ProductReviews.vue b/assets/vue/ProductReviews.vue
@@ -120,7 +120,7 @@
 <script>
 import PaginationLinks from './components/PaginationLinks.vue';
 import ShownEntries from './components/ShownEntries.vue';
-import {packageLink, reportLink} from './helpers/links.js';
+import {packageLink, reportLink, setupPopover} from './helpers/links.js';
 import {genParamWatchers, getParams, setParam} from './helpers/params.js';
 import Refresh from './mixins/refresh.js';
 
@@ -179,6 +179,7 @@ export default {
         });
       }
       this.reviews = reviews;
+      setupPopover();
     },
     filterNow() {
       this.cancelApiRefresh();

diff --git a/assets/vue/RecentReviews.vue b/assets/vue/RecentReviews.vue
@@ -101,7 +101,7 @@
 import PaginationLinks from './components/PaginationLinks.vue';
 import PriorityBadge from './components/PriorityBadge.vue';
 import ShownEntries from './components/ShownEntries.vue';
-import {externalLink, packageLink, reportLink} from './helpers/links.js';
+import {externalLink, packageLink, reportLink, setupPopover} from './helpers/links.js';
 import {genParamWatchers, getParams, setParam} from './helpers/params.js';
 import Refresh from './mixins/refresh.js';
 import moment from 'moment';
@@ -164,6 +164,7 @@ export default {
         });
       }
       this.reviews = reviews;
+      setupPopover();
     },
     filterNow() {
       this.cancelApiRefresh();

diff --git a/assets/vue/ReviewSearch.vue b/assets/vue/ReviewSearch.vue
@@ -94,7 +94,7 @@
 <script>
 import PaginationLinks from './components/PaginationLinks.vue';
 import ShownEntries from './components/ShownEntries.vue';
-import {reportLink} from './helpers/links.js';
+import {reportLink, setupPopover} from './helpers/links.js';
 import {genParamWatchers, getParams, setParam} from './helpers/params.js';
 import Refresh from './mixins/refresh.js';
 import moment from 'moment';
@@ -154,6 +154,7 @@ export default {
         });
       }
       this.reviews = reviews;
+      setupPopover();
     },
     filterNow() {
       this.cancelApiRefresh();

diff --git a/lib/Cavil/Controller/Pagination.pm b/lib/Cavil/Controller/Pagination.pm
@@ -94,7 +94,7 @@ sub product_reviews ($self) {
       search            => $search
     }
   );
-  $self->render(json => $page);
+  $self->render(json => $self->_mark_active_packages($page));
 }
 
 sub recent_reviews ($self) {
@@ -111,7 +111,7 @@ sub recent_reviews ($self) {
 
   my $page = $self->packages->paginate_recent_reviews(
     {limit => $limit, offset => $offset, by_user => $by_user, search => $search});
-  $self->render(json => $page);
+  $self->render(json => $self->_mark_active_packages($page));
 }
 
 sub review_search ($self) {
@@ -131,7 +131,7 @@ sub review_search ($self) {
   my $name = $self->stash('name');
   my $page = $self->packages->paginate_review_search($name,
     {limit => $limit, offset => $offset, not_obsolete => $not_obsolete, search => $search, pattern => $pattern});
-  $self->render(json => $page);
+  $self->render(json => $self->_mark_active_packages($page));
 }
 
 sub _mark_active_packages ($self, $page) {

diff --git a/t/api.t b/t/api.t
@@ -276,7 +276,8 @@ subtest 'Pagination' => sub {
       ->json_is('/page/0/package', 'perl-Mojolicious')->json_is('/page/0/id', 1)->json_is('/page/0/state', 'obsolete')
       ->json_has('/page/0/checksum')->json_has('/page/0/comment')->json_has('/page/0/user')
       ->json_has('/page/0/created_epoch')->json_has('/page/0/imported_epoch')->json_has('/page/0/indexed_epoch')
-      ->json_has('/page/0/unpacked_epoch')->json_hasnt('/page/1');
+      ->json_has('/page/0/unpacked_epoch')->json_is('/page/0/active_jobs' => 0)->json_is('/page/0/failed_jobs' => 0)
+      ->json_hasnt('/page/1');
     $t->get_ok('/pagination/search/perl-Mojolicious?notObsolete=true')->json_is('/start', 1)->json_is('/end', 0)
       ->json_is('/total', 0)->json_hasnt('/page/0');
     $t->get_ok('/pagination/search/perl-Mojolicious?filter=Artistic')->json_is('/start', 1)->json_is('/end', 1)
@@ -295,7 +296,7 @@ subtest 'Pagination' => sub {
     $t->get_ok('/pagination/products/openSUSE:Test')->json_is('/start', 1)->json_is('/end', 3)->json_is('/total', 3)
       ->json_is('/page/0/id', 6)->json_is('/page/0/state', 'new')->json_is('/page/0/name', 'test-package-5')
       ->json_has('/page/0/checksum')->json_has('/page/0/imported_epoch')->json_has('/page/0/indexed_epoch')
-      ->json_has('/page/0/unpacked_epoch');
+      ->json_has('/page/0/unpacked_epoch')->json_is('/page/0/active_jobs' => 0)->json_is('/page/0/failed_jobs' => 0);
     $t->get_ok('/pagination/products/openSUSE:Test?filter=package-3')->json_is('/start', 1)->json_is('/end', 1)
       ->json_is('/total', 1)->json_is('/page/0/id', 4)->json_hasnt('/page/1');
   };
@@ -313,7 +314,8 @@ subtest 'Pagination' => sub {
       ->json_is('/page/0/id',   2)->json_is('/page/0/state', 'new')->json_is('/page/0/priority', 5)
       ->json_is('/page/0/name', 'test-package-1')->json_has('/page/0/checksum')->json_has('/page/0/external_link')
       ->json_has('/page/0/created_epoch')->json_has('/page/0/imported_epoch')->json_has('/page/0/indexed_epoch')
-      ->json_has('/page/0/unpacked_epoch')->json_hasnt('/page/3');
+      ->json_has('/page/0/unpacked_epoch')->json_is('/page/0/active_jobs' => 0)->json_is('/page/0/failed_jobs' => 0)
+      ->json_hasnt('/page/3');
     $t->get_ok('/pagination/reviews/open?filter=package-3')->json_is('/start', 1)->json_is('/end', 1)
       ->json_is('/total', 1)->json_is('/page/0/id', 4)->json_hasnt('/page/1');
   };

diff --git a/t/manual_review.t b/t/manual_review.t
@@ -260,7 +260,8 @@ subtest 'Manual review' => sub {
     ->json_is('/page/0/login',  'tester')->json_is('/page/0/name', 'perl-Mojolicious')->json_is('/page/0/priority', 5)
     ->json_is('/page/0/result', 'Test review')->json_is('/page/0/state', 'acceptable')
     ->json_has('/page/0/created_epoch')->json_has('/page/0/imported_epoch')->json_has('/page/0/indexed_epoch')
-    ->json_has('/page/0/unpacked_epoch')->json_hasnt('/page/1');
+    ->json_has('/page/0/unpacked_epoch')->json_is('/page/0/active_jobs' => 0)->json_is('/page/0/failed_jobs' => 0)
+    ->json_hasnt('/page/1');
 
   $t->get_ok('/logout')->status_is(302)->header_is(Location => '/');
 };