Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Betafix/vocabuifix #1617

Merged
merged 5 commits into from
Jul 16, 2024
Merged

Betafix/vocabuifix #1617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05f70cc
Add relase notes for v0.34.0
markquintontulloch Jul 15, 2024
6894975
Merge pull request #1613 from alliance-genome/release/v0.34.0
markquintontulloch Jul 15, 2024
9de1945
Change to use stringlist template for synonyms in controlled vocabulary
VarunReddy1111 Jul 3, 2024
46a6860
Removed unused import
VarunReddy1111 Jul 3, 2024
7e9d3be
Merge pull request #1615 from alliance-genome/release/v0.34.1
VarunReddy1111 Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@

https://agr-jira.atlassian.net/wiki/spaces/ATEAM/overview

## v0.34.0
* New features
* Paralogy annotations loaded into persistent store (SCRUM-4086, SCRUM-4088, SCRUM-4089, SCRUM-4090)
* Expression annotations loaded into persistent store (SCRUM-3708)
* HTPTags loaded into persistent store (SCRUM-4221)
* Data load file history sorted by Load Started timestamp (SCRUM-4204)
* Data loads stopped if error rate exceeds cutoff threshold (SCRUM-3871)
* SGD strain background added to defining fields of disease/phenotype annotations (SCRUM-4137)
* Turned off cleanup of associated annotations/associations (SCRUM-4107)
* Fixes and maintenance
* Fixed reporting of out-of-date errors in data loads tooltip (SCRUM-4210)
* Fixed loading of genes with duplicate cross-references (SCRUM-4160)
* Fixed lading of interactions via NCBI_Gene cross-references (SCRUM-4159)
* Fixed orthology load cleanup (SCRUM-4146)
* Fixed duplicate references on interactions (SCRUM-4114)
* Fixed subject filter on disease annotations table (SCRUM-4113)
* Fixed association of secondary phenotype annotations with primary annotations that have condition relations (SCRUM-4062)
* Fixed downloads of large exception lists (SCRUM-3871)
* Fixed missing exception messages in downloads (SCRUM-4162)

## v0.33.0
* New features
* Importing gene interactions into the persistent store (phase 2) (SCRUM-3809)
Expand Down
33 changes: 2 additions & 31 deletions src/main/cliapp/src/containers/controlledVocabularyPage/ControlledVocabularyTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import { GenericDataTable } from '../../components/GenericDataTable/GenericDataT
import { useMutation, useQuery } from '@tanstack/react-query';
import { Toast } from 'primereact/toast';

import { Tooltip } from 'primereact/tooltip';
import { EllipsisTableCell } from '../../components/EllipsisTableCell';
import { ListTableCell } from '../../components/ListTableCell';
import { useControlledVocabularyService } from '../../service/useControlledVocabularyService';
import { VocabularyService } from '../../service/VocabularyService';
import { TrueFalseDropdown } from '../../components/TrueFalseDropDownSelector';
Expand All @@ -21,6 +18,7 @@ import { useGetTableData } from '../../service/useGetTableData';
import { useGetUserSettings } from '../../service/useGetUserSettings';
import { SearchService } from '../../service/SearchService';
import { setNewEntity } from '../../utils/utils';
import { StringListTemplate } from '../../components/Templates/StringListTemplate';

export const ControlledVocabularyTable = () => {
const newTermReducer = (state, action) => {
Expand Down Expand Up @@ -216,33 +214,6 @@ export const ControlledVocabularyTable = () => {
}
};

const synonymsBodyTemplate = (rowData) => {
if (rowData?.synonyms && rowData.synonyms.length > 0) {
const sortedSynonyms = rowData.synonyms.sort();
const listTemplate = (synonym) => {
return (
<EllipsisTableCell>
<div dangerouslySetInnerHTML={{ __html: synonym }} />
</EllipsisTableCell>
);
};
return (
<>
<div className={`a${rowData.id}${rowData.synonyms[0]}`}>
<ListTableCell template={listTemplate} listData={sortedSynonyms} />
</div>
<Tooltip
target={`.a${rowData.id}${rowData.synonyms[0]}`}
style={{ width: '450px', maxWidth: '450px' }}
position="left"
>
<ListTableCell template={listTemplate} listData={sortedSynonyms} />
</Tooltip>
</>
);
}
};

const columns = [
{
field: 'id',
Expand Down Expand Up @@ -270,7 +241,7 @@ export const ControlledVocabularyTable = () => {
header: 'Synonyms',
sortable: true,
filterConfig: FILTER_CONFIGS.synonymsFilterConfig,
body: synonymsBodyTemplate,
body: (rowData) => <StringListTemplate list={rowData.synonyms} />,
},
{
field: 'vocabulary.name',
Expand Down
Loading