Merge pull request #1216 from alliance-genome/release/v0.24.0-rc1

Release/v0.24.0-rc1

RELEASE-NOTES.md

@@ -2,6 +2,27 @@
 
 https://agr-jira.atlassian.net/wiki/spaces/ATEAM/overview
 
+## v0.22.0
+ * New features
+ * Loaded orthology data (SCRUM-2710)
+ * Loaded Xenbase genes and orthology data (SCRUM-3056)
+ * Loaded Biological Spatial Ontology (BSPO) (SCRUM-3062)
+ * Loaded Cell Ontology(CL) (SCRUM-3059)
+ * Loaded Clinical Measurement Ontology (SCRUM-3060)
+ * Loaded Pathway Ontology (PW) (SCRUM-3057)
+ * Loaded Uberson Ontology (SCRUM-2454)
+ * Loaded Rat Strain Ontology (RS) (SCRUM-3050)
+ * Loaded Molecular Interactions Ontology (MI) (SCRUM-2451)
+ * Loaded Mouse Pathology Ontology (MPATH) (SCRUM-2452)
+ * Loaded Rat Strain Ontology (RS) (SCRUM-3036)
+
+ * Fixes and maintenance
+ * Bulk load cleanup procedure fixed (SCRUM-3143 & SCRUM-3073)
+ * Removed DataProvider reset endpoint (SCRUM-3037)
+ * Fixed age error when cancelling edit mode after having duplicated annotation (SCRUM-3030)
+ * Fixed disappearing loads in Data Loads page when multiple loads running (SCRUM-3051)
+ * Disabled reset buttons during row editing (SCRUM-3030)
+
 ## v0.21.0
  * New features
  * Duplicate Disease Annotation popup (SCRUM-2911)

src/main/cliapp/src/components/Autocomplete/LiteratureAutocompleteTemplate.js

@@ -6,7 +6,8 @@ export const LiteratureAutocompleteTemplate = ({ item, setAutocompleteHoverItem,
  return (
  <div>
  <div onMouseOver={(event) => onSelectionOver(event, item, query, op, setAutocompleteHoverItem)}>
- {getRefString(item)}
+ {getRefString(item)} <p></p>
+ {item.short_citation}
  </div>
  </div>
  );

src/main/cliapp/src/components/Editors/boolean/BooleanFormEditor.js

@@ -0,0 +1,42 @@
+import { FormErrorMessageComponent } from '../../Error/FormErrorMessageComponent';
+import { Dropdown } from 'primereact/dropdown';
+import { BooleanAdditionalFieldData } from '../../FieldData/BooleanAdditionalFieldData';
+import { FormFieldWrapper } from '../../FormFieldWrapper';
+import { useControlledVocabularyService } from "../../../service/useControlledVocabularyService";
+
+export const BooleanFormEditor = ({
+ value,
+ name,
+ label,
+ onValueChange,
+ widgetColumnSize,
+ labelColumnSize,
+ fieldDetailsColumnSize,
+ errorMessages
+}) => {
+
+ const booleanTerms = useControlledVocabularyService("generic_boolean_terms");
+
+ return (
+ <>
+ <FormFieldWrapper
+ labelColumnSize={labelColumnSize}
+ fieldDetailsColumnSize={fieldDetailsColumnSize}
+ widgetColumnSize={widgetColumnSize}
+ fieldName={label}
+ formField={
+ <Dropdown
+ name={name}
+ value={value}
+ options={booleanTerms}
+ optionLabel='text'
+ optionValue='name'
+ onChange={onValueChange}
+ />
+ }
+ errorField={<FormErrorMessageComponent errorMessages={errorMessages} errorField={name} />}
+ additionalDataField={<BooleanAdditionalFieldData value={value?.toString()} />}
+ />
+ </>
+ );
+};

src/main/cliapp/src/components/Editors/boolean/BooleanTableEditor.js

@@ -0,0 +1,32 @@
+import React from "react";
+import { TrueFalseDropdown } from "../../TrueFalseDropDownSelector";
+import { ErrorMessageComponent } from "../../Error/ErrorMessageComponent";
+import { useControlledVocabularyService } from "../../../service/useControlledVocabularyService";
+
+export const BooleanTableEditor = ({ rowProps, errorMessagesRef, field}) => {
+
+ const booleanTerms = useControlledVocabularyService("generic_boolean_terms");
+
+ const editorChange = (props, event) => {
+ let updatedEntities = [...props.props.value];
+
+ if (event.value && event.value !== '') {
+ updatedEntities[props.rowIndex][field]= JSON.parse(event.value.name);
+ } else {
+ updatedEntities[props.rowIndex][field] = null;
+ }
+ };
+
+ return (
+ <>
+ <TrueFalseDropdown
+ options={booleanTerms}
+ editorChange={editorChange}
+ props={rowProps}
+ field={field}
+ showClear={true}
+ />
+ <ErrorMessageComponent errorMessages={errorMessagesRef.current[rowProps.rowIndex]} errorField={field} />
+ </>
+ );
+};

src/main/cliapp/src/components/Editors/inCollection/InCollectionFormEditor.js

@@ -4,37 +4,39 @@ import { inCollectionSearch } from './utils';
 import { FormErrorMessageComponent } from '../../Error/FormErrorMessageComponent';
 import { InCollectionAdditionalFieldData } from '../../FieldData/InCollectionAdditionalFieldData';
 import { VocabTermAutocompleteTemplate } from '../../Autocomplete/VocabTermAutocompleteTemplate';
+import { FormFieldWrapper } from '../../FormFieldWrapper';
+
+export const InCollectionFormEditor = ({
+ inCollection,
+ onInCollectionValueChange,
+ widgetColumnSize,
+ labelColumnSize,
+ fieldDetailsColumnSize,
+ errorMessages
+}) => {
 
-export const InCollectionFormEditor = ({ 
- inCollection, 
- onInCollectionValueChange, 
- widgetColumnSize, 
- labelColumnSize, 
- fieldDetailsColumnSize, 
- errorMessages 
- }) => {
-
  return (
- <div className="grid">
- <div className={labelColumnSize}>
- <label htmlFor="inCollection">In Collection</label>
- </div>
- <div className={widgetColumnSize}>
- <AutocompleteFormEditor
- name="inCollection-input"
- search={inCollectionSearch}
- initialValue={inCollection}
- fieldName='inCollection'
- subField='name'
- onValueChangeHandler={onInCollectionValueChange}
- valueDisplay={(item, setAutocompleteSelectedItem, op, query) =>
- <VocabTermAutocompleteTemplate item={item} op={op} query={query} setAutocompleteSelectedItem={setAutocompleteSelectedItem}/>}
- />
- <FormErrorMessageComponent errorMessages={errorMessages} errorField={"inCollection"}/>
- </div>
- <div className={fieldDetailsColumnSize}>
- <InCollectionAdditionalFieldData name={inCollection?.name}/>
- </div>
- </div>
- )
-}
+ <>
+ <FormFieldWrapper
+ labelColumnSize={labelColumnSize}
+ fieldDetailsColumnSize={fieldDetailsColumnSize}
+ widgetColumnSize={widgetColumnSize}
+ fieldName="In Collection"
+ formField={
+ <AutocompleteFormEditor
+ name="inCollection-input"
+ search={inCollectionSearch}
+ initialValue={inCollection}
+ fieldName='inCollection'
+ subField='name'
+ onValueChangeHandler={onInCollectionValueChange}
+ valueDisplay={(item, setAutocompleteSelectedItem, op, query) =>
+ <VocabTermAutocompleteTemplate item={item} op={op} query={query} setAutocompleteSelectedItem={setAutocompleteSelectedItem} />}
+ />
+ }
+ errorField={<FormErrorMessageComponent errorMessages={errorMessages} errorField={"inCollection"} />}
+ additionalDataField={<InCollectionAdditionalFieldData name={inCollection?.name}/>}
+ />
+ </>
+ );
+};

src/main/cliapp/src/components/Editors/inCollection/InCollectionTableEditor.js

@@ -0,0 +1,30 @@
+import React from "react";
+import { defaultAutocompleteOnChange } from "../../../utils/utils";
+import { AutocompleteEditor } from "../../Autocomplete/AutocompleteEditor";
+import { inCollectionSearch } from "./utils";
+import { VocabTermAutocompleteTemplate } from "../../Autocomplete/VocabTermAutocompleteTemplate";
+import { ErrorMessageComponent } from "../../Error/ErrorMessageComponent";
+
+const onInCollectionValueChange = (event, setFieldValue, props) => {
+ defaultAutocompleteOnChange(props, event, "inCollection", setFieldValue, "name");
+};
+
+export const InCollectionTableEditor = ({ rowProps, errorMessagesRef } ) => {
+ return (
+ <>
+ <AutocompleteEditor
+ search={inCollectionSearch}
+ initialValue={rowProps.rowData.inCollection?.name}
+ rowProps={rowProps}
+ fieldName='inCollection'
+ onValueChangeHandler={onInCollectionValueChange}
+ valueDisplay={(item, setAutocompleteSelectedItem, op, query) =>
+ <VocabTermAutocompleteTemplate item={item} op={op} query={query} setAutocompleteSelectedItem={setAutocompleteSelectedItem}/>}
+ />
+ <ErrorMessageComponent
+ errorMessages={errorMessagesRef.current[rowProps.rowIndex]}
+ errorField='inCollection'
+ />
+ </>
+ );
+};