diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24fd672cfec..b799adfb196 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
## [22.09.2]
* [UI]: Fixed bug causing associated project samples to be added to the cart with the wrong project identifier. See [PR 1395](https://github.com/phac-nml/irida/pull/1395)
* [UI]: Fixed bug preventing the removal of locked samples within a project. See [PR 1396](https://github.com/phac-nml/irida/pull/1396)
+* [Developer/UI]: Fixed bug preventing managers from sharing project samples. See [PR 1398](https://github.com/phac-nml/irida/pull/1398)
* [UI]: Fixed bug where a sample added to the cart from the sample detail viewer still had a `Add to Cart` button if the viewer was closed and relaunched. See [PR 1397](https://github.com/phac-nml/irida/pull/1397)
## [22.09.1] - 2022/10/21
diff --git a/src/main/java/ca/corefacility/bioinformatics/irida/service/impl/sample/SampleServiceImpl.java b/src/main/java/ca/corefacility/bioinformatics/irida/service/impl/sample/SampleServiceImpl.java
index c64b15d85f6..69dcdeed60c 100644
--- a/src/main/java/ca/corefacility/bioinformatics/irida/service/impl/sample/SampleServiceImpl.java
+++ b/src/main/java/ca/corefacility/bioinformatics/irida/service/impl/sample/SampleServiceImpl.java
@@ -345,7 +345,7 @@ public Sample getSampleBySampleName(Project project, String sampleName) {
*/
@Override
@Transactional(readOnly = true)
- @PreAuthorize("hasAnyRole('ROLE_ADMIN', 'ROLE_SEQUENCER') or hasPermission(#project, 'canReadProject')")
+ @PreAuthorize("hasAnyRole('ROLE_ADMIN', 'ROLE_SEQUENCER') or hasPermission(#projectIds, 'canReadProject')")
public Map> getSampleIdsBySampleNameForProjects(List projectIds,
List sampleNames) {
return sampleRepository.getSampleIdsBySampleNameInProjects(projectIds, sampleNames)
@@ -673,8 +673,9 @@ public List getQCEntriesForSample(Sample sample) {
public Map> getQCEntriesForSamples(List samples) {
return qcEntryRepository.getQCEntriesForSamples(samples)
.stream()
- .collect(Collectors.groupingBy(sampleQCEntryTuple -> (Long) sampleQCEntryTuple.get(0), Collectors
- .mapping(sampleQCEntryTuple -> (QCEntry) sampleQCEntryTuple.get(1), Collectors.toList())));
+ .collect(Collectors.groupingBy(sampleQCEntryTuple -> (Long) sampleQCEntryTuple.get(0),
+ Collectors.mapping(sampleQCEntryTuple -> (QCEntry) sampleQCEntryTuple.get(1),
+ Collectors.toList())));
}
/**
@@ -835,9 +836,7 @@ public List getSamplesCreatedGrouped(Date createdDate, Statist
public Map getCoverageForSamplesInProject(Project project, List sampleIds) {
return psjRepository.calculateCoverageForSamplesInProject(project, sampleIds)
.stream()
- .collect(HashMap::new,
- (sampleCoverageMap, sampleCoverageTuple) -> sampleCoverageMap
- .put((Long) sampleCoverageTuple.get(0), (Long) sampleCoverageTuple.get(1)),
- Map::putAll);
+ .collect(HashMap::new, (sampleCoverageMap, sampleCoverageTuple) -> sampleCoverageMap.put(
+ (Long) sampleCoverageTuple.get(0), (Long) sampleCoverageTuple.get(1)), Map::putAll);
}
}
diff --git a/src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/projects/ProjectSamplesPageIT.java b/src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/projects/ProjectSamplesPageIT.java
index 1421b73b0dd..5393462b460 100644
--- a/src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/projects/ProjectSamplesPageIT.java
+++ b/src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/projects/ProjectSamplesPageIT.java
@@ -21,7 +21,7 @@
* Integration test to ensure that the Project Details Page.
*
*/
-@DatabaseSetup("/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesView.xml")
+@DatabaseSetup("/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesPage.xml")
public class ProjectSamplesPageIT extends AbstractIridaUIITChromeDriver {
String FIRST_SAMPLE_NAME = "sample55422r";
String SECOND_SAMPLE_NAME = "sample-5-fg-22";
diff --git a/src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/projects/ProjectShareSamplesIT.java b/src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/projects/ProjectShareSamplesIT.java
index b9273d1da63..723e12eb1bc 100644
--- a/src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/projects/ProjectShareSamplesIT.java
+++ b/src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/projects/ProjectShareSamplesIT.java
@@ -12,7 +12,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
-@DatabaseSetup("/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesView.xml")
+@DatabaseSetup("/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectShareSamples.xml")
public class ProjectShareSamplesIT extends AbstractIridaUIITChromeDriver {
private ShareSamplesPage shareSamplesPage = ShareSamplesPage.initPage(driver());
diff --git a/src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesPage.xml b/src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesPage.xml
new file mode 100644
index 00000000000..735668ebddf
--- /dev/null
+++ b/src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesPage.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesView.xml b/src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectShareSamples.xml
similarity index 98%
rename from src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesView.xml
rename to src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectShareSamples.xml
index 9002f9e289d..fb97d888d14 100644
--- a/src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectSamplesView.xml
+++ b/src/test/resources/ca/corefacility/bioinformatics/irida/ria/web/projects/ProjectShareSamples.xml
@@ -1,6 +1,6 @@
-
+
@@ -26,7 +26,7 @@
-
+