-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1216 from alliance-genome/release/v0.24.0-rc1
Release/v0.24.0-rc1
- Loading branch information
Showing
185 changed files
with
5,203 additions
and
507 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
src/main/cliapp/src/components/Editors/boolean/BooleanFormEditor.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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()} />} | ||
/> | ||
</> | ||
); | ||
}; |
32 changes: 32 additions & 0 deletions
32
src/main/cliapp/src/components/Editors/boolean/BooleanTableEditor.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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} /> | ||
</> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
src/main/cliapp/src/components/Editors/inCollection/InCollectionTableEditor.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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' | ||
/> | ||
</> | ||
); | ||
}; |
38 changes: 0 additions & 38 deletions
38
src/main/cliapp/src/components/Editors/internal/InternalFormEditor.js
This file was deleted.
Oops, something went wrong.
37 changes: 0 additions & 37 deletions
37
src/main/cliapp/src/components/Editors/isExtinct/IsExtinctFormEditor.js
This file was deleted.
Oops, something went wrong.
38 changes: 0 additions & 38 deletions
38
src/main/cliapp/src/components/Editors/obsolete/ObsoleteFormEditor.js
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.