Merge pull request #1056 from alliance-genome/release/v0.20.0-rc1

Release/v0.20.0 rc1
alliance-genome · Jun 2, 2023 · 71e1480 · 71e1480
2 parents e1f4bb3 + d7f4583
commit 71e1480
Show file tree

Hide file tree

Showing 169 changed files with 9,833 additions and 1,647 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,7 +1,18 @@
 # AGR curation release notes
-
+ 
 https://agr-jira.atlassian.net/wiki/spaces/ATEAM/overview
 
+## v0.18.0
+ * New feature
+    * Rearrange "New Annotation" pop-up fields for disease annotations (SCRUM-2754)
+    * Re-enable editing of allele symbol and name (SCRUM-2383)
+    * Load Phenotype and Trait Ontology (PATO) into the persistent store (SCRUM-2450)
+    * Load Human Phenotype Ontology (HP) into the persistent store (SCRUM-2449)
+ * Fixes & maintenance
+    * Fix some table state persistence bugs (SCRUM-2754)
+    * Fix column reordering persistence (SCRUM-2457)
+    * Fix Gene names being displayed in symbol field (SCRUM-2840)
+
 ## v0.17.0
  * New features
     * Improved reporting of bulk load deprecation events (SCRUM-2761)

diff --git a/src/main/cliapp/src/constants/FilterFields.js b/src/main/cliapp/src/constants/FilterFields.js
@@ -8,6 +8,10 @@ export const FIELD_SETS = Object.freeze({
     filterName: "abstractFilter",
     fields: ["abstract"],
   },
+  alleleFunctionalImpactsFieldSet: {
+    filterName: "alleleFunctionalImpactsFilter",
+    fields: ["alleleFunctionalImpacts.functionalImpacts.name", "alleleFunctionalImpacts.phenotypeTerm.curie", "alleleFunctionalImpacts.phenotypeTerm.name", "alleleFunctionalImpacts.phenotypeStatement", "alleleFunctionalImpacts.evidence.curie"],
+  },
   alleleNameFieldSet: {
     filterName: "alleleNameFilter",
     fields: ["alleleFullName.displayText", "alleleFullName.formatText"],
@@ -24,6 +28,10 @@ export const FIELD_SETS = Object.freeze({
     filterName: "alleleSynonymsFilter",
     fields: ["alleleSynonyms.displayText", "alleleSynonyms.formatText"],
   },
+  alleleGermlineTransmissionStatusFieldSet: {
+    filterName: "alleleGermlineTransmissionStatusFilter",
+    fields: ["alleleGermlineTransmissionStatus.germlineTransmissionStatus.name", "alleleGermlineTransmissionStatus.evidence.curie"]
+  },
   alleleInheritanceModesFieldSet: {
     filterName: "alleleInheritanceModesFilter",
     fields: ["alleleInheritanceModes.inheritanceMode.name", "alleleInheritanceModes.phenotypeTerm.curie", "alleleInheritanceModes.phenotypeTerm.name", "alleleInheritanceModes.phenotypeStatement", "alleleInheritanceModes.evidence.curie"],
@@ -353,6 +361,8 @@ export const FIELD_SETS = Object.freeze({
 export const FILTER_CONFIGS = Object.freeze({
   abbreviationFilterConfig:                 { filterComponentType: 'input', fieldSets: [FIELD_SETS.abbreviationFieldSet] },
   abstractFilterConfig:                     { filterComponentType: "input", fieldSets: [FIELD_SETS.abstractFieldSet]},
+  alleleFunctionalImpactsFilterConfig:      { filterComponentType: "input", fieldSets: [FIELD_SETS.alleleFunctionalImpactsFieldSet] },
+  alleleGermlineTransmissionStatusFilterConfig: {filterComponentType: "input", fieldSets: [FIELD_SETS.alleleGermlineTransmissionStatusFieldSet]},
   alleleInheritanceModesFilterConfig:       { filterComponentType: "input", fieldSets: [FIELD_SETS.alleleInheritanceModesFieldSet] },
   alleleMutationFilterConfig:               { filterComponentType: "input", fieldSets: [FIELD_SETS.alleleMutationFieldSet] },
   alleleNameFilterConfig:                   { filterComponentType: "input", fieldSets: [FIELD_SETS.alleleNameFieldSet] },

diff --git a/...liapp/src/containers/affectedGenomicModelPage/__tests__/AffectedGenomicModelTable.test.js b/...liapp/src/containers/affectedGenomicModelPage/__tests__/AffectedGenomicModelTable.test.js
@@ -1,5 +1,4 @@
 import React from "react";
-import { act } from "react-dom/test-utils";
 import { waitFor } from "@testing-library/react";
 import { renderWithClient } from '../../../tools/jest/utils';
 import { AffectedGenomicModelTable } from "../AffectedGenomicModelTable";
@@ -17,10 +16,7 @@ describe("<AffectedGenomicModelTable />", () => {
 	});
 
 	it("Renders without crashing", async () => {
-		let result;
-		act(() => {
-			result = renderWithClient(<AffectedGenomicModelTable />);
-		});
+		let result = await renderWithClient(<AffectedGenomicModelTable />);
 
 		await waitFor(() => {
 			expect(result);
@@ -29,19 +25,13 @@ describe("<AffectedGenomicModelTable />", () => {
 	});
 
 	it("Contains Correct Table Name", async () => {
-		let result;
-		act(() => {
-			result = renderWithClient(<AffectedGenomicModelTable />);
-		});
+		let result = await renderWithClient(<AffectedGenomicModelTable />);
 		const tableTitle = await result.findByText(/Affected Genomic Models Table/i);
 		expect(tableTitle).toBeInTheDocument();
 	});
 
 	it("Contains Correct Table Data", async () => {
-		let result;
-		act(() => {
-			result = renderWithClient(<AffectedGenomicModelTable />);
-		});
+		let result = await renderWithClient(<AffectedGenomicModelTable />);
 		const curie = await result.findByText(/WB:WBStrain00051221/i);
 		expect(curie).toBeInTheDocument();
 	});