Merge pull request #1318 from phac-nml/hotfix/22.05.4

Fixed filtering by file due to bad url
phac-nml · Jun 16, 2022 · 8f04d8e · 8f04d8e
2 parents faa4d0a + 6d8c437
commit 8f04d8e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 
 # Changelog
 
+## [22.05.4] - 2022/06/16
+* [UI]: Fixed bug preventing filter samples by file to fail on invalid url. See [PR 1318](https://github.com/phac-nml/irida/pull/1318)
+
 ## [22.05.3] - 2022/06/14
 * [Developer]: Fix bug where users with only group access to a project couldn't view sample details or metadata. See [PR 1313](https://github.com/phac-nml/irida/pull/1313)
 * [Developer]: Fix sql order by bug on admin statistics page that was causing page not to load when `ONLY_FULL_GROUP_BY` enabled. See [PR 1313](https://github.com/phac-nml/irida/pull/1313)
@@ -90,6 +93,7 @@
 
 ## [...previous](https://github.com/phac-nml/irida/blob/21.09.2/CHANGELOG.md)
 
+[22.05.4]: https://github.com/phac-nml/irida/compare/22.05.3...22.05.4
 [22.05.3]: https://github.com/phac-nml/irida/compare/22.05.2...22.05.3
 [22.05.2]: https://github.com/phac-nml/irida/compare/22.05.1...22.05.2
 [22.05.1]: https://github.com/phac-nml/irida/compare/22.05...22.05.1

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   <groupId>ca.corefacility.bioinformatics</groupId>
   <artifactId>irida</artifactId>
   <packaging>war</packaging>
-  <version>22.05.3</version>
+  <version>22.05.4</version>
   <name>irida</name>
   <url>http://www.irida.ca</url>
 

diff --git a/src/main/webapp/resources/js/apis/activities/activities.js b/src/main/webapp/resources/js/apis/activities/activities.js
@@ -1,10 +1,11 @@
 import axios from "axios";
+import { setBaseUrl } from "../../utilities/url-utilities";
 
 /**
  * @file API for handling activities
  */
 
-const BASE_URL = `/ajax/activities`;
+const BASE_URL = setBaseUrl(`/ajax/activities`);
 
 /**
  * Get a page of activities for a project

diff --git a/src/main/webapp/resources/js/pages/projects/samples/components/FilterByFileModal.jsx b/src/main/webapp/resources/js/pages/projects/samples/components/FilterByFileModal.jsx
@@ -5,6 +5,7 @@ import { CheckCircleTwoTone, WarningTwoTone } from "@ant-design/icons";
 import { green6, red6 } from "../../../../styles/colors";
 import VirtualList from "rc-virtual-list";
 import { SPACE_SM } from "../../../../styles/spacing";
+import { setBaseUrl } from "../../../../utilities/url-utilities";
 
 const ROW_HEIGHT = 43;
 
@@ -47,7 +48,7 @@ export default function FilterByFileModal({ visible, onComplete, onCancel }) {
       let parsed = contents.split(/[\s,]+/);
       const projectIds = [projectId, ...associated];
 
-      fetch(`/ajax/samples/validate`, {
+      fetch(setBaseUrl(`/ajax/samples/validate`), {
         headers: {
           Accept: "application/json",
           "Content-Type": "application/json",