Skip to content

Story/cite 185 - Managed authorities page should be filterable by import source #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PradnyaC11 wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Story/cite 185 - Managed authorities page should be filterable by import source #302

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6fc3d9
[CITE-185] added a new mapping for list filtered by source and added …
sathish2379 May 24, 2024
d5dd829
[CITE-185] Added importer name for IsisCB in config
PradnyaC11 Apr 3, 2025
607768c
[CITE-185] Updated viaf record mapping
PradnyaC11 Apr 4, 2025
a6f98c8
[CITE-185] Fixed errors with authority source filter and reverted via…
PradnyaC11 Apr 8, 2025
624b205
Merge branch 'develop' into story/CITE-185-3
PradnyaC11 Apr 8, 2025
b780297
Merge branch 'develop' into story/CITE-185-3
rajvi-patel-22 Nov 13, 2025
0f875d7
[CITE-185] Address review comments
rajvi-patel-22 Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions citesphere/src/main/java/edu/asu/diging/citesphere/core/service/IAuthorityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,6 @@ AuthoritySearchResult searchAuthorityEntries(IUser user, String firstName, Strin
Page<IAuthorityEntry> getAuthoritiesByGroup(long groupId, int page, int pageSize);

Page<IAuthorityEntry> getUserSpecificAuthorities(IUser user, int page, int pageSize);

List<IAuthorityEntry> getAuthoritiesBySource(IUser user, String source);
}
5 changes: 5 additions & 0 deletions citesphere/src/main/java/edu/asu/diging/citesphere/core/service/impl/AuthorityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,11 @@ public Page<IAuthorityEntry> getAuthoritiesByGroup(long groupId, int page, int p
return entryRepository.findByGroupsOrderByName(groupId, pageable);
}

@Override
public List<IAuthorityEntry> getAuthoritiesBySource(IUser user, String source) {
return entryRepository.findByUsernameAndImporterIdOrderByName(user.getUsername(), source);
}

@Override
public Page<IAuthorityEntry> getUserSpecificAuthorities(IUser user, int page, int pageSize) {
Pageable pageable = PageRequest.of(page, pageSize);
Expand Down
47 changes: 43 additions & 4 deletions ...src/main/java/edu/asu/diging/citesphere/web/user/authorities/AuthorityListController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ public String list(Model model, Authentication authentication,
Page<IAuthorityEntry> authoritiesPage = authorityService.getAll(user,
userGroups.stream().map(group -> group.getGroupId()).collect(Collectors.toList()),pageInt, authorityPageSize);
List<IAuthorityEntry> authorities = authoritiesPage.getContent();
model.addAttribute("importedAuthoritySources", authorities.stream()
.map(authorityEntry -> authorityEntry.getImporterId()).distinct().collect(Collectors.toList()));
model.addAttribute("authorities", authorities);
model.addAttribute("groups", userGroups);
model.addAttribute("displayBy", "all");
Expand All @@ -73,8 +75,12 @@ public String getAuthoritiesForGroup(Model model, Authentication authentication,
pageInt = (pageInt - 1) < 0 ? 0 : pageInt - 1;
IUser user = (IUser)authentication.getPrincipal();
Page<IAuthorityEntry> authoritiesPage = authorityService.getAuthoritiesByGroup(Long.valueOf(zoteroGroupId), pageInt, authorityPageSize);
model.addAttribute("authorities", authoritiesPage.getContent());
model.addAttribute("groups", citationManager.getGroups((IUser)authentication.getPrincipal()));
List<IAuthorityEntry> authorities = authoritiesPage.getContent();

model.addAttribute("importedAuthoritySources", authorities.stream()
.map(authorityEntry -> authorityEntry.getImporterId()).distinct().collect(Collectors.toList()));
model.addAttribute("authorities", authorities);
model.addAttribute("groups", citationManager.getGroups(user));
model.addAttribute("displayBy", zoteroGroupId);
model.addAttribute("username", user.getUsername());
model.addAttribute("total", authoritiesPage.getTotalElements());
Expand All @@ -95,13 +101,46 @@ public String getAuthoritiesForUser(Model model, Authentication authentication,
pageInt = (pageInt - 1) < 0 ? 0 : pageInt - 1;
IUser user = (IUser)authentication.getPrincipal();
Page<IAuthorityEntry> authoritiesPage = authorityService.getUserSpecificAuthorities(user, pageInt, authorityPageSize);
model.addAttribute("authorities", authoritiesPage.getContent());
model.addAttribute("groups", citationManager.getGroups((IUser)authentication.getPrincipal()));
List<IAuthorityEntry> authorities = authoritiesPage.getContent();

model.addAttribute("importedAuthoritySources", authorities.stream()
.map(authorityEntry -> authorityEntry.getImporterId()).distinct().collect(Collectors.toList()));
model.addAttribute("authorities", authorities);
model.addAttribute("groups", citationManager.getGroups(user));
model.addAttribute("displayBy", "userSpecific");
model.addAttribute("username", user.getUsername());
model.addAttribute("total", authoritiesPage.getTotalElements());
model.addAttribute("totalPages", authoritiesPage.getTotalPages() > 0 ? authoritiesPage.getTotalPages() : 1);
model.addAttribute("currentPage", page);
return "auth/authorities/list";
}

@RequestMapping("/auth/authority/list/{source}")
public String getAuthoritiesForSource(Model model, Authentication authentication,
@PathVariable("source") String source, @RequestParam(defaultValue = "1", required = false, value = "page") String page) {
System.out.println(source);
Copy link
Copy Markdown
Member

@jdamerow jdamerow Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

Integer pageInt = 1;
try {
pageInt = new Integer(page);
} catch (NumberFormatException ex) {
logger.error("Trying to access invalid page number: ", ex);
}
pageInt = (pageInt - 1) < 0 ? 0 : pageInt - 1;
IUser user = (IUser) authentication.getPrincipal();
List<ICitationGroup> userGroups = citationManager.getGroups(user);
Page<IAuthorityEntry> authoritiesPage = authorityService.getAll(user,
userGroups.stream().map(group -> group.getGroupId()).collect(Collectors.toList()),pageInt, authorityPageSize);
Copy link
Copy Markdown
Member

@jdamerow jdamerow Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see my comment below. This could for example be formatted something like:

Page<IAuthorityEntry> authoritiesPage = authorityService.getAll(
                user,
                userGroups.stream().map(group -> group.getGroupId()).collect(Collectors.toList()),
                pageInt, 
                authorityPageSize);

List<IAuthorityEntry> authorities = authoritiesPage.getContent();
model.addAttribute("importedAuthoritySources", authorities.stream()
.map(authorityEntry -> authorityEntry.getImporterId()).distinct().collect(Collectors.toList()));
model.addAttribute("authorities",
authorityService.getAuthoritiesBySource(user, source.equals("null") ? null : source));
model.addAttribute("groups", userGroups);
model.addAttribute("displayBy", "source-" + source);
model.addAttribute("username", user.getUsername());
model.addAttribute("total", authoritiesPage.getTotalElements());
model.addAttribute("totalPages", authoritiesPage.getTotalPages() > 0 ? authoritiesPage.getTotalPages() : 1);
model.addAttribute("currentPage", page);
return "auth/authorities/list";
Copy link
Copy Markdown
Member

@jdamerow jdamerow Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code should be cleaned up with intentional empty lines to organize blocks and intentional newlines for parameters of long method calls.

}
}
1 change: 1 addition & 0 deletions citesphere/src/main/resources/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ _isiscb_disable_ssl_verification = ${isiscb.disable.ssl.verification}
# Importer Names
_importer_name_authority.importer.viaf=VIAF
_importer_name_authority.importer.conceptpower=Conceptpower
_importer_name_authority.importer.isiscb=IsisCB

_creation_default_item_type=JOURNAL_ARTICLE
_available_item_columns=version,publicationTitle,volume,issue,pages,series,seriesTitle,abstractNote,dateAdded
Expand Down
20 changes: 13 additions & 7 deletions citesphere/src/main/webapp/WEB-INF/views/auth/authorities/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,16 @@
});

function getAuthorityUrl(displayAuthoritiesVal) {
if (displayAuthoritiesVal === 'all') {
return [[@{/auth/authority/list}]];
} else if (displayAuthoritiesVal === 'userSpecific') {
return [[@{/auth/authority/user/list}]];
} else {
if (displayAuthoritiesVal === 'all') {
return [[@{/auth/authority/list}]];
} else if (displayAuthoritiesVal === 'userSpecific') {
return [[@{/auth/authority/user/list}]];
} else if (displayAuthoritiesVal.startsWith('source')) {
var source = displayAuthoritiesVal.split("-")[1];
return [[@{/auth/authority/list/}]] + source;
} else {
return [[@{/auth/authority/}]] + displayAuthoritiesVal + "/list";
}
}
}

</script>
Expand All @@ -95,7 +98,10 @@ <h2>Managed Authority Entries</h2>
<option th:selected="${#strings.equals(displayBy, 'userSpecific')}" value="userSpecific">[[${username}]]</option>
<span th:each="groupDetail:${groups}">
<option th:selected="${#strings.equals(displayBy, groupDetail.groupId)}" th:value="${groupDetail.groupId}">Group - [[${groupDetail.name}]]</option>
</span>
</span>
<span th:each="source:${importedAuthoritySources}">
<option th:selected="${#strings.equals(displayBy, 'source-' + source)}" th:value="${'source-' + source}">Source - [[${@environment.getProperty('_importer_name_' + source)}]]</option>
</span>
</select><br><br>

<ul id="pagination-top" class="pagination-sm"></ul>
Expand Down
24 changes: 24 additions & 0 deletions ...phere/src/test/java/edu/asu/diging/citesphere/core/service/impl/AuthorityServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,4 +651,28 @@ public void test_getUserSpecificAuthorities_emptyResult() {
Page<IAuthorityEntry> searchResult = managerToTest.getUserSpecificAuthorities(user, page, pageSize);
Assert.assertTrue(searchResult.isEmpty());
}

@Test
public void test_getAuthoritiesBySource() {
String source = "testsource";
List<IAuthorityEntry> expectedEntries = new ArrayList<>();
expectedEntries.add(entry1);
expectedEntries.add(entry2);
Mockito.when(entryRepository.findByUsernameAndImporterIdOrderByName(user.getUsername(), source))
.thenReturn(expectedEntries);

List<IAuthorityEntry> actualEntries = managerToTest.getAuthoritiesBySource(user, source);
Assert.assertEquals(expectedEntries, actualEntries);
}

@Test
public void test_getAuthoritiesBySource_noEntriesFound() {
String source = "testsource";
List<IAuthorityEntry> expectedEntries = new ArrayList<>();
Mockito.when(entryRepository.findByUsernameAndImporterIdOrderByName(user.getUsername(), source))
.thenReturn(expectedEntries);

List<IAuthorityEntry> actualEntries = managerToTest.getAuthoritiesBySource(user, source);
Assert.assertEquals(expectedEntries, actualEntries);
}
}