From 5de805b9cd1bc119ee8801c38cc4d1011aebd597 Mon Sep 17 00:00:00 2001
From: Rajvi Patel <rajvi2232000@gmail.com>
Date: Thu, 20 Nov 2025 16:27:57 -0700
Subject: [PATCH 1/6] [CITE-243] Display group name instead of group id on jobs
 page

---
 .../citesphere/core/model/jobs/IGroupSyncJob.java   |  4 ++++
 .../core/model/jobs/impl/GroupSyncJob.java          | 13 +++++++++++++
 .../core/service/jobs/impl/SyncJobManager.java      | 12 ++++++++++--
 .../main/webapp/WEB-INF/views/auth/jobs/list.html   |  6 ++++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/core/model/jobs/IGroupSyncJob.java b/citesphere/src/main/java/edu/asu/diging/citesphere/core/model/jobs/IGroupSyncJob.java
index 49f6b6c00..501bcf3cd 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/core/model/jobs/IGroupSyncJob.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/core/model/jobs/IGroupSyncJob.java
@@ -19,5 +19,9 @@ public interface IGroupSyncJob {
     void setFinishedOn(OffsetDateTime finishedOn);
 
     OffsetDateTime getFinishedOn();
+    
+    String getGroupName();
+    
+    void setGroupName(String groupName);
 
 }
\ No newline at end of file
diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/core/model/jobs/impl/GroupSyncJob.java b/citesphere/src/main/java/edu/asu/diging/citesphere/core/model/jobs/impl/GroupSyncJob.java
index d6a41b55f..82e3524ec 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/core/model/jobs/impl/GroupSyncJob.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/core/model/jobs/impl/GroupSyncJob.java
@@ -3,6 +3,7 @@
 import java.time.OffsetDateTime;
 
 import javax.persistence.Entity;
+import javax.persistence.Transient;
 
 import edu.asu.diging.citesphere.core.model.jobs.IGroupSyncJob;
 
@@ -13,6 +14,8 @@ public class GroupSyncJob extends Job implements IGroupSyncJob {
     private long total;
     private long current;
     private OffsetDateTime finishedOn;
+    @Transient
+    private String groupName;
     
     /* (non-Javadoc)
      * @see edu.asu.diging.citesphere.core.model.jobs.impl.IGroupSyncJob#getGroupId()
@@ -64,4 +67,14 @@ public OffsetDateTime getFinishedOn() {
     public void setFinishedOn(OffsetDateTime finishedOn) {
         this.finishedOn = finishedOn;
     }  
+    
+    @Override
+    public String getGroupName() {
+        return groupName;
+    }
+    
+    @Override
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
 }
diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
index fa4fb77df..f53ddf0be 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
@@ -1,6 +1,7 @@
 package edu.asu.diging.citesphere.core.service.jobs.impl;
 
 import java.time.OffsetDateTime;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -13,7 +14,6 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import edu.asu.diging.citesphere.core.model.jobs.IJob;
 import edu.asu.diging.citesphere.core.model.jobs.JobStatus;
 import edu.asu.diging.citesphere.core.model.jobs.impl.GroupSyncJob;
 import edu.asu.diging.citesphere.core.repository.jobs.GroupSyncJobRepository;
@@ -64,7 +64,15 @@ public GroupSyncJob getMostRecentJob(String groupId) {
     @Override
     public List<GroupSyncJob> getJobs(IUser user, Pageable page) {
         List<ICitationGroup> groups = citationManager.getGroups(user);
-        return jobRepo.findByGroupIdIn(groups.stream().map(g -> g.getGroupId() + "").collect(Collectors.toList()), page);
+        if (groups == null || groups.isEmpty()) {
+            return Collections.emptyList();
+        }
+        Map<String, String> groupNames = groups.stream().collect(
+                Collectors.toMap(g -> g.getGroupId() + "", ICitationGroup::getName, (existing, replacement) -> existing));
+        List<GroupSyncJob> jobs = jobRepo.findByGroupIdIn(
+                groups.stream().map(g -> g.getGroupId() + "").collect(Collectors.toList()), page);
+        jobs.forEach(job -> job.setGroupName(groupNames.get(job.getGroupId())));
+        return jobs;
     }
     
     @Override
diff --git a/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html b/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
index bad98d32e..f2f321774 100644
--- a/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
+++ b/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
@@ -37,8 +37,10 @@ <h1>Jobs</h1>
 </tr>
     <tr th:each="job:${jobs}"> 
         <td>[[${job.id}]]</td>
-        <td><span class="label label-default">
-                <a th:href="@{|/auth/group/${job.groupId}/items|}" style="color: #ffffff">[[${job.groupId}]] </a> 
+        <td>
+            <span class="label label-default">
+                <a th:href="@{|/auth/group/${job.groupId}/items|}" style="color: #ffffff"
+                        th:text="${job.groupName} ?: ${job.groupId}">[[${job.groupId}]]</a> 
             </span>
         </td>
         <td>[[${job.status}]]</td>

From 230c027fd9c4f73b9086dce85924f0d8cad23dd2 Mon Sep 17 00:00:00 2001
From: Rajvi Patel <rajvi2232000@gmail.com>
Date: Mon, 24 Nov 2025 17:19:27 -0700
Subject: [PATCH 2/6] [CITE-243] Add filter for group on job list pgae

---
 .../webapp/WEB-INF/views/auth/jobs/list.html  | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html b/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
index f2f321774..ad3a8eab8 100644
--- a/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
+++ b/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
@@ -4,15 +4,28 @@
 <script th:inline="javascript">
 //# sourceURL=page.js
 $(function() {
+    var selectedGroup = /*[[${selectedGroupId}]]*/ "";
+    var totalPages = Number(/*[[${total}]]*/ 1) || 1;
+    var currentPage = Number(/*[[${page}]]*/ 1) || 1;
+    if (currentPage > totalPages) {
+        currentPage = totalPages;
+    }
+    if (currentPage < 1) {
+        currentPage = 1;
+    }
     $('#pagination-top').twbsPagination({
-        totalPages: [(${total})],
-        startPage: [(${page})],
+        totalPages: totalPages,
+        startPage: currentPage,
         prev: "«",
         next: "»",
         visiblePages: 10,
         initiateStartPageClick: false,
         onPageClick: function (event, page) {
-            window.location.href = "[(@{|/auth/jobs/sync/list|})]?page=" + (page - 1);
+            var pageParam = "?page=" + (page - 1);
+            if (selectedGroup && selectedGroup.trim().length > 0) {
+                pageParam = "?groupId=" + encodeURIComponent(selectedGroup) + "&page=" + (page - 1);
+            }
+            window.location.href = /*[[@{/auth/jobs/sync/list}]]*/ "" + pageParam;
         }
     });
 });
@@ -23,7 +36,24 @@
 <div layout:fragment="content">
 <h1>Jobs</h1>
 
-<ul id="pagination-top" class="pagination-sm"></ul>
+<div style="margin-bottom: 15px;">
+    <div class="dropdown pull-left">
+        <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+            <span th:text="${selectedGroupName}">Group</span>
+            <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+            <li><a th:href="@{/auth/jobs/sync/list}">All groups</a></li>
+            <li role="separator" class="divider"></li>
+            <li th:each="group : ${groups}">
+                <a th:href="@{|/auth/jobs/sync/list?groupId=${group.groupId}|}"
+                   th:text="${#strings.isEmpty(group.name) ? group.groupId : group.name}">Group Name</a>
+            </li>
+        </ul>
+    </div>
+    <ul id="pagination-top" class="pagination-sm pull-left" style="margin-left: 15px; margin-top: 0;"></ul>
+    <div class="clearfix"></div>
+</div>
 
 <table class="table table-striped">
 <tr>

From 4113c7d62297f97c6223f6996800e5156bafb026 Mon Sep 17 00:00:00 2001
From: Rajvi Patel <rajvi2232000@gmail.com>
Date: Tue, 25 Nov 2025 15:40:00 -0700
Subject: [PATCH 3/6] [CITE-243] Added groupId filter support in getJobs and
 getJobsCount method

---
 .../core/service/jobs/ISyncJobManager.java    |  4 ++--
 .../service/jobs/impl/SyncJobManager.java     | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java
index bb245da6c..d9b6c4836 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java
@@ -13,9 +13,9 @@ public interface ISyncJobManager {
 
     GroupSyncJob getMostRecentJob(String groupId);
 
-    List<GroupSyncJob> getJobs(IUser user, Pageable page);
+    List<GroupSyncJob> getJobs(IUser user, Pageable page, String groupId);
 
-    long getJobsCount(IUser user);
+    long getJobsCount(IUser user, String groupId);
 
     void cancelJob(String jobId);
 
diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
index f53ddf0be..92b23d771 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import edu.asu.diging.citesphere.core.model.jobs.JobStatus;
 import edu.asu.diging.citesphere.core.model.jobs.impl.GroupSyncJob;
@@ -62,26 +63,39 @@ public GroupSyncJob getMostRecentJob(String groupId) {
     }
     
     @Override
-    public List<GroupSyncJob> getJobs(IUser user, Pageable page) {
+    public List<GroupSyncJob> getJobs(IUser user, Pageable page, String groupId) {
         List<ICitationGroup> groups = citationManager.getGroups(user);
         if (groups == null || groups.isEmpty()) {
             return Collections.emptyList();
         }
         Map<String, String> groupNames = groups.stream().collect(
                 Collectors.toMap(g -> g.getGroupId() + "", ICitationGroup::getName, (existing, replacement) -> existing));
-        List<GroupSyncJob> jobs = jobRepo.findByGroupIdIn(
-                groups.stream().map(g -> g.getGroupId() + "").collect(Collectors.toList()), page);
+        List<String> groupIds = groups.stream().map(g -> g.getGroupId() + "").collect(Collectors.toList());
+        if (StringUtils.hasText(groupId)) {
+            if (!groupIds.contains(groupId)) {
+                return Collections.emptyList();
+            }
+            groupIds = Collections.singletonList(groupId);
+        }
+        List<GroupSyncJob> jobs = jobRepo.findByGroupIdIn(groupIds, page);
         jobs.forEach(job -> job.setGroupName(groupNames.get(job.getGroupId())));
         return jobs;
     }
     
     @Override
-    public long getJobsCount(IUser user) {
+    public long getJobsCount(IUser user, String groupId) {
         List<ICitationGroup> groups = citationManager.getGroups(user);
         if (groups == null) {
             return -1;
         }
-        return jobRepo.countByGroupIdIn(groups.stream().map(g -> g.getGroupId() + "").collect(Collectors.toList()));
+        List<String> groupIds = groups.stream().map(g -> g.getGroupId() + "").collect(Collectors.toList());
+        if (StringUtils.hasText(groupId)) {
+            if (!groupIds.contains(groupId)) {
+                return 0;
+            }
+            groupIds = Collections.singletonList(groupId);
+        }
+        return jobRepo.countByGroupIdIn(groupIds);
     }
     
     @Override

From bbf051e438e9ac6bba478e511f108071480930ee Mon Sep 17 00:00:00 2001
From: Rajvi Patel <rajvi2232000@gmail.com>
Date: Tue, 25 Nov 2025 15:40:42 -0700
Subject: [PATCH 4/6] [CITE-243] Update API endpoint to allow filtering jobs by
 groups

---
 .../web/user/jobs/SyncJobsController.java     | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/web/user/jobs/SyncJobsController.java b/citesphere/src/main/java/edu/asu/diging/citesphere/web/user/jobs/SyncJobsController.java
index cf13e4dfd..f6f53f26d 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/web/user/jobs/SyncJobsController.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/web/user/jobs/SyncJobsController.java
@@ -1,5 +1,7 @@
 package edu.asu.diging.citesphere.web.user.jobs;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort.Direction;
@@ -7,9 +9,13 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import edu.asu.diging.citesphere.core.service.ICitationManager;
 import edu.asu.diging.citesphere.core.service.jobs.ISyncJobManager;
+import edu.asu.diging.citesphere.model.bib.ICitationGroup;
 import edu.asu.diging.citesphere.user.IUser;
 
 @Controller
@@ -17,16 +23,34 @@ public class SyncJobsController {
 
     @Autowired
     private ISyncJobManager jobManager;
+    
+    @Autowired
+    private ICitationManager citationManager;
 
     @RequestMapping("/auth/jobs/sync/list")
     public String list(Model model, @PageableDefault(sort = { "createdOn" }, direction = Direction.DESC) Pageable page,
-            Authentication authentication) {
-        long total = jobManager.getJobsCount((IUser) authentication.getPrincipal());
+            Authentication authentication, @RequestParam(name = "groupId", required = false) String groupId) {
+        IUser user = (IUser) authentication.getPrincipal();
+        List<ICitationGroup> groups = citationManager.getGroups(user);
+        model.addAttribute("groups", groups);
+        String selectedGroupId = StringUtils.hasText(groupId) ? groupId : "";
+        model.addAttribute("selectedGroupId", selectedGroupId);
+        String selectedGroupName = "Group";
+        if (StringUtils.hasText(groupId) && groups != null) {
+            selectedGroupName = groups.stream()
+                .filter(g -> g != null && groupId.equals(g.getGroupId() + ""))
+                .findFirst()
+                .map(g -> StringUtils.hasText(g.getName()) ? g.getName() : groupId)
+                .orElse("Group");
+        }
+        model.addAttribute("selectedGroupName", selectedGroupName);
+        long total = jobManager.getJobsCount(user, groupId);
         if (total == -1) {
             return "redirect:/";
         }
-        model.addAttribute("jobs", jobManager.getJobs((IUser) authentication.getPrincipal(), page));
-        model.addAttribute("total", Math.ceil(total/page.getPageSize()));
+        model.addAttribute("jobs", jobManager.getJobs(user, page, groupId));
+        double pageCount = Math.ceil((double) total / page.getPageSize());
+        model.addAttribute("total", pageCount < 1 ? 1 : pageCount);
         model.addAttribute("page", page.getPageNumber() + 1);
         return "auth/jobs/list";
     }

From 986da0c98ca6c025b4407116fc6826ae3da8031a Mon Sep 17 00:00:00 2001
From: Rajvi Patel <rajvi2232000@gmail.com>
Date: Thu, 4 Dec 2025 16:22:02 -0700
Subject: [PATCH 5/6] [CITE-243] Update template to handle pagination with
 filter

---
 .../webapp/WEB-INF/views/auth/jobs/list.html  | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html b/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
index ad3a8eab8..ddb0aba77 100644
--- a/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
+++ b/citesphere/src/main/webapp/WEB-INF/views/auth/jobs/list.html
@@ -5,8 +5,10 @@
 //# sourceURL=page.js
 $(function() {
     var selectedGroup = /*[[${selectedGroupId}]]*/ "";
+    var selectedStatus = /*[[${selectedStatus}]]*/ "";
     var totalPages = Number(/*[[${total}]]*/ 1) || 1;
     var currentPage = Number(/*[[${page}]]*/ 1) || 1;
+    var baseUrl = /*[[@{/auth/jobs/sync/list}]]*/ "";
     if (currentPage > totalPages) {
         currentPage = totalPages;
     }
@@ -21,11 +23,15 @@
         visiblePages: 10,
         initiateStartPageClick: false,
         onPageClick: function (event, page) {
-            var pageParam = "?page=" + (page - 1);
+            var params = [];
+            params.push("page=" + (page - 1));
             if (selectedGroup && selectedGroup.trim().length > 0) {
-                pageParam = "?groupId=" + encodeURIComponent(selectedGroup) + "&page=" + (page - 1);
+                params.push("groupId=" + encodeURIComponent(selectedGroup));
             }
-            window.location.href = /*[[@{/auth/jobs/sync/list}]]*/ "" + pageParam;
+            if (selectedStatus && selectedStatus.trim().length > 0) {
+                params.push("status=" + encodeURIComponent(selectedStatus));
+            }
+            window.location.href = baseUrl + "?" + params.join("&");
         }
     });
 });
@@ -43,18 +49,33 @@ <h1>Jobs</h1>
             <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-            <li><a th:href="@{/auth/jobs/sync/list}">All groups</a></li>
+            <li><a th:href="@{|/auth/jobs/sync/list${selectedStatus != null and selectedStatus != '' ? '?status=' + selectedStatus : ''}|}">All groups</a></li>
             <li role="separator" class="divider"></li>
             <li th:each="group : ${groups}">
-                <a th:href="@{|/auth/jobs/sync/list?groupId=${group.groupId}|}"
+                <a th:href="@{|/auth/jobs/sync/list?groupId=${group.groupId}${selectedStatus != null and selectedStatus != '' ? '&status=' + selectedStatus : ''}|}"
                    th:text="${#strings.isEmpty(group.name) ? group.groupId : group.name}">Group Name</a>
             </li>
         </ul>
     </div>
-    <ul id="pagination-top" class="pagination-sm pull-left" style="margin-left: 15px; margin-top: 0;"></ul>
+    <div class="dropdown pull-left" style="margin-left: 10px;">
+        <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+            <span th:text="${selectedStatusName}">Status</span>
+            <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
+            <li><a th:href="@{|/auth/jobs/sync/list${selectedGroupId != null and selectedGroupId != '' ? '?groupId=' + selectedGroupId : ''}|}">All statuses</a></li>
+            <li role="separator" class="divider"></li>
+            <li th:each="status : ${statuses}">
+                <a th:href="@{|/auth/jobs/sync/list?status=${status}${selectedGroupId != null and selectedGroupId != '' ? '&groupId=' + selectedGroupId : ''}|}"
+                   th:text="${status}">Status</a>
+            </li>
+        </ul>
+    </div>
     <div class="clearfix"></div>
 </div>
 
+<ul id="pagination-top" class="pagination-sm"></ul>
+
 <table class="table table-striped">
 <tr>
 <th>Job ID</th>

From 9c432cc843ed1af2696d8b03fc12321eaac71c9d Mon Sep 17 00:00:00 2001
From: Rajvi Patel <rajvi2232000@gmail.com>
Date: Thu, 4 Dec 2025 16:28:11 -0700
Subject: [PATCH 6/6] [CITE-243] Update controller and add filter for status

---
 .../jobs/GroupSyncJobRepository.java          |  5 ++++
 .../core/service/jobs/ISyncJobManager.java    |  4 ++--
 .../service/jobs/impl/SyncJobManager.java     | 24 ++++++++++++++++---
 .../web/user/jobs/SyncJobsController.java     | 22 ++++++++++++++---
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/core/repository/jobs/GroupSyncJobRepository.java b/citesphere/src/main/java/edu/asu/diging/citesphere/core/repository/jobs/GroupSyncJobRepository.java
index 77f266f21..66fe7d6af 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/core/repository/jobs/GroupSyncJobRepository.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/core/repository/jobs/GroupSyncJobRepository.java
@@ -6,6 +6,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
+import edu.asu.diging.citesphere.core.model.jobs.JobStatus;
 import edu.asu.diging.citesphere.core.model.jobs.impl.GroupSyncJob;
 
 public interface GroupSyncJobRepository extends PagingAndSortingRepository<GroupSyncJob, String> {
@@ -15,4 +16,8 @@ public interface GroupSyncJobRepository extends PagingAndSortingRepository<Group
     public List<GroupSyncJob> findByGroupIdIn(List<String> groupIds, Pageable page);
     
     public long countByGroupIdIn(List<String> groupIds);
+    
+    public List<GroupSyncJob> findByGroupIdInAndStatus(List<String> groupIds, JobStatus status, Pageable page);
+    
+    public long countByGroupIdInAndStatus(List<String> groupIds, JobStatus status);
 }
diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java
index d9b6c4836..4eff46b4b 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/ISyncJobManager.java
@@ -13,9 +13,9 @@ public interface ISyncJobManager {
 
     GroupSyncJob getMostRecentJob(String groupId);
 
-    List<GroupSyncJob> getJobs(IUser user, Pageable page, String groupId);
+    List<GroupSyncJob> getJobs(IUser user, Pageable page, String groupId, String status);
 
-    long getJobsCount(IUser user, String groupId);
+    long getJobsCount(IUser user, String groupId, String status);
 
     void cancelJob(String jobId);
 
diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
index 92b23d771..01bc41667 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/core/service/jobs/impl/SyncJobManager.java
@@ -63,7 +63,7 @@ public GroupSyncJob getMostRecentJob(String groupId) {
     }
     
     @Override
-    public List<GroupSyncJob> getJobs(IUser user, Pageable page, String groupId) {
+    public List<GroupSyncJob> getJobs(IUser user, Pageable page, String groupId, String status) {
         List<ICitationGroup> groups = citationManager.getGroups(user);
         if (groups == null || groups.isEmpty()) {
             return Collections.emptyList();
@@ -77,13 +77,23 @@ public List<GroupSyncJob> getJobs(IUser user, Pageable page, String groupId) {
             }
             groupIds = Collections.singletonList(groupId);
         }
-        List<GroupSyncJob> jobs = jobRepo.findByGroupIdIn(groupIds, page);
+        List<GroupSyncJob> jobs;
+        if (StringUtils.hasText(status)) {
+            try {
+                JobStatus jobStatus = JobStatus.valueOf(status.toUpperCase());
+                jobs = jobRepo.findByGroupIdInAndStatus(groupIds, jobStatus, page);
+            } catch (IllegalArgumentException e) {
+                return Collections.emptyList();
+            }
+        } else {
+            jobs = jobRepo.findByGroupIdIn(groupIds, page);
+        }
         jobs.forEach(job -> job.setGroupName(groupNames.get(job.getGroupId())));
         return jobs;
     }
     
     @Override
-    public long getJobsCount(IUser user, String groupId) {
+    public long getJobsCount(IUser user, String groupId, String status) {
         List<ICitationGroup> groups = citationManager.getGroups(user);
         if (groups == null) {
             return -1;
@@ -95,6 +105,14 @@ public long getJobsCount(IUser user, String groupId) {
             }
             groupIds = Collections.singletonList(groupId);
         }
+        if (StringUtils.hasText(status)) {
+            try {
+                JobStatus jobStatus = JobStatus.valueOf(status.toUpperCase());
+                return jobRepo.countByGroupIdInAndStatus(groupIds, jobStatus);
+            } catch (IllegalArgumentException e) {
+                return 0;
+            }
+        }
         return jobRepo.countByGroupIdIn(groupIds);
     }
     
diff --git a/citesphere/src/main/java/edu/asu/diging/citesphere/web/user/jobs/SyncJobsController.java b/citesphere/src/main/java/edu/asu/diging/citesphere/web/user/jobs/SyncJobsController.java
index f6f53f26d..53c719049 100644
--- a/citesphere/src/main/java/edu/asu/diging/citesphere/web/user/jobs/SyncJobsController.java
+++ b/citesphere/src/main/java/edu/asu/diging/citesphere/web/user/jobs/SyncJobsController.java
@@ -1,5 +1,6 @@
 package edu.asu.diging.citesphere.web.user.jobs;
 
+import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +14,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import edu.asu.diging.citesphere.core.model.jobs.JobStatus;
 import edu.asu.diging.citesphere.core.service.ICitationManager;
 import edu.asu.diging.citesphere.core.service.jobs.ISyncJobManager;
 import edu.asu.diging.citesphere.model.bib.ICitationGroup;
@@ -29,10 +31,12 @@ public class SyncJobsController {
 
     @RequestMapping("/auth/jobs/sync/list")
     public String list(Model model, @PageableDefault(sort = { "createdOn" }, direction = Direction.DESC) Pageable page,
-            Authentication authentication, @RequestParam(name = "groupId", required = false) String groupId) {
+            Authentication authentication, @RequestParam(name = "groupId", required = false) String groupId,
+            @RequestParam(name = "status", required = false) String status) {
         IUser user = (IUser) authentication.getPrincipal();
         List<ICitationGroup> groups = citationManager.getGroups(user);
         model.addAttribute("groups", groups);
+        model.addAttribute("statuses", Arrays.asList(JobStatus.values()));
         String selectedGroupId = StringUtils.hasText(groupId) ? groupId : "";
         model.addAttribute("selectedGroupId", selectedGroupId);
         String selectedGroupName = "Group";
@@ -44,11 +48,23 @@ public String list(Model model, @PageableDefault(sort = { "createdOn" }, directi
                 .orElse("Group");
         }
         model.addAttribute("selectedGroupName", selectedGroupName);
-        long total = jobManager.getJobsCount(user, groupId);
+        String selectedStatus = StringUtils.hasText(status) ? status : "";
+        model.addAttribute("selectedStatus", selectedStatus);
+        String selectedStatusName = "Status";
+        if (StringUtils.hasText(status)) {
+            try {
+                JobStatus jobStatus = JobStatus.valueOf(status.toUpperCase());
+                selectedStatusName = jobStatus.name();
+            } catch (IllegalArgumentException e) {
+                selectedStatusName = "Status";
+            }
+        }
+        model.addAttribute("selectedStatusName", selectedStatusName);
+        long total = jobManager.getJobsCount(user, groupId, status);
         if (total == -1) {
             return "redirect:/";
         }
-        model.addAttribute("jobs", jobManager.getJobs(user, page, groupId));
+        model.addAttribute("jobs", jobManager.getJobs(user, page, groupId, status));
         double pageCount = Math.ceil((double) total / page.getPageSize());
         model.addAttribute("total", pageCount < 1 ? 1 : pageCount);
         model.addAttribute("page", page.getPageNumber() + 1);