Merge pull request #1479 from phac-nml/hotfix-associated-and-linelist

HOTFIX: Associated project dropdown and Linelist column order

CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # Changelog
 
+## [23.01.1] - 2023/03/21
+* [UI]: Fixed issue where template order was not applied when applying a linelist template. See [PR 1479](https://github.com/phac-nml/irida/pull/1479)
+* [UI]: Added select all to associated projects filter on project > samples page. See [PR 1479](https://github.com/phac-nml/irida/pull/1479)
+
 ## [23.01] - 2023/02/28
 * [UI/Developer]: Updated `react-router` to the version 6.4.3. See[PR 1405](https://github.com/phac-nml/irida/pull/1405)
 * [Developer] Updated developer setup documentation, ignore java_pid\*.hprof files, and added quality of life file `gradle.properties`. See [PR 1415](https://github.com/phac-nml/irida/pull/1415).
@@ -176,8 +180,9 @@
 
 ## [...previous](https://github.com/phac-nml/irida/blob/21.09.2/CHANGELOG.md)
 
-[Unreleased]: https://github.com/phac-nml/irida/compare/23.01...HEAD
+[Unreleased]: https://github.com/phac-nml/irida/compare/23.01.1...HEAD
 
+[23.01.1]: https://github.com/phac-nml/irida/compare/23.01...23.01.1
 [23.01]: https://github.com/phac-nml/irida/compare/22.09.7...23.01
 [22.09.7]: https://github.com/phac-nml/irida/compare/22.09.6...22.09.7
 [22.09.6]: https://github.com/phac-nml/irida/compare/22.09.5...22.09.6

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 }
 
 group = "ca.corefacility.bioinformatics"
-version = "23.01"
+version = "23.01.1"
 description = "irida"
 
 java {

src/main/webapp/resources/js/pages/projects/linelist/components/Table/Table.jsx

@@ -157,7 +157,10 @@ export class TableComponent extends React.Component {
     /*
     Combine back the sample name plus the new ordered state for the table.
      */
-    this.columnApi.applyColumnState({ state: [...defaults, ...final] });
+    this.columnApi.applyColumnState({
+      state: [...defaults, ...final],
+      applyOrder: true,
+    });
   };
 
   /*

src/main/webapp/resources/js/pages/projects/samples/components/SamplesTable.jsx

@@ -292,6 +292,7 @@ export function SamplesTable() {
         return <ProjectTag project={row.project} />;
       },
       filters: associatedProjects,
+      filterMode: "tree",
     },
     {
       title: i18n("SamplesTable.Column.collectedBy"),

src/test/java/ca/corefacility/bioinformatics/irida/junit5/listeners/IntegrationUITestListener.java

@@ -94,6 +94,7 @@ public static void startWebDriver() {
 		}
 
 		options.addArguments("--window-size=1920,1080");
+		options.addArguments("--remote-allow-origins=*");
 
 		// Set up default download directory
 		if (!DOWNLOAD_DIRECTORY.exists()) {

src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/pages/projects/ProjectSamplesPage.java

@@ -400,15 +400,16 @@ public void toggleAssociatedProject(String projectName) {
 		int prevTotal = getTableSummary().getTotal();
 		projectsFilterToggle.click();
 		WebElement selection = driver.findElement(
-				By.xpath("//li[@class='ant-dropdown-menu-item' and span='" + projectName + "']"));
+				By.xpath("//div[@class='ant-tree-list-holder-inner']//span[@title='" + projectName + "']"));
 		selection.click();
 		driver.findElement(By.xpath("//button[@type='button' and span='OK']")).click();
 		waitForTableToUpdate(prevTotal);
 	}
 
 	public void removeAssociatedProject(String projectName) {
 		projectsFilterToggle.click();
-		WebElement selection = driver.findElement(By.xpath("//li/span/span[text()='" + projectName + "']"));
+		WebElement selection = driver.findElement(
+				By.xpath("//div[@class='ant-tree-list-holder-inner']//span[@title='" + projectName + "']"));
 		selection.click();
 		driver.findElement(By.xpath("//button[@type='button' and span='OK']")).click();
 		waitForTime(200);