diff --git a/src/ensembl/src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences.scss b/src/ensembl/src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences.scss index 0c3e69c5e03f1e44aeff91e52aa0be22ecb403a0..3cc87151effd51e3a551f164aeacf6fbb6ec2367 100644 --- a/src/ensembl/src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences.scss +++ b/src/ensembl/src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences.scss @@ -13,16 +13,9 @@ } .geneDetails { - display: grid; - grid-template-columns: [gene-symbol] min-content 10px [stable-id] auto; - .geneSymbol { - grid-column: gene-symbol; font-weight: $bold; - } - - .stableId { - grid-column: stable-id; + margin-right: 10px; } } @@ -76,19 +69,6 @@ margin: 10px 0 20px 20px; } -.xrefGroupSourceName { - margin-right: 5px; - display: inline-block; -} - -.xrefGroupWithSameLabel { - display: inline-block; -} - -.xrefGroupLinks { - display: inline-grid; -} - .externalReferenceContainer{ margin-bottom:10px; -} \ No newline at end of file +} diff --git a/src/ensembl/src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences.tsx b/src/ensembl/src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences.tsx index 3e692e288e9323a167ab378cb71f5008775afa2f..77d9cb1ff138ff93f1645b092ed936c00cfadf61 100644 --- a/src/ensembl/src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences.tsx +++ b/src/ensembl/src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences.tsx @@ -43,8 +43,8 @@ import { parseEnsObjectIdFromUrl } from 'src/shared/state/ens-object/ensObjectHe const QUERY = gql` query Gene($stable_id: String!, $genome_id: String!) { gene(byId: { stable_id: $stable_id, genome_id: $genome_id }) { - name stable_id + symbol external_references { accession_id name @@ -80,7 +80,7 @@ type Transcript = { }; type Gene = { - name: string; + symbol: string; stable_id: string; transcripts: Transcript[]; external_references: ExternalReferenceType[]; @@ -145,8 +145,8 @@ const GeneExternalReferences = () => { return (
-
{data.gene.name}
-
{data.gene.stable_id}
+ {data.gene.symbol} + {data.gene.stable_id}
Gene
@@ -169,13 +169,7 @@ const GeneExternalReferences = () => {
); } else { - return externalReferencesGroup.references[0].name === - externalReferencesGroup.source.name - ? renderXrefGroupWithSameLabels(externalReferencesGroup, key) - : renderXrefGroupWithDifferentLabels( - externalReferencesGroup, - key - ); + return renderXrefGroup(externalReferencesGroup, key); } } )} @@ -186,7 +180,6 @@ const GeneExternalReferences = () => { {transcripts.map((transcript, key) => { return (
- {' '}
); @@ -228,33 +221,7 @@ const RenderTranscriptXrefGroup = (props: { transcript: Transcript }) => { ); }; -const renderXrefGroupWithSameLabels = ( - externalReferencesGroup: ExternalReferencesGroup, - key: number -) => { - return ( -
-
- {externalReferencesGroup.source.name} -
-
- {externalReferencesGroup.references.map((entry, key) => ( - - ))} -
-
- ); -}; - -const renderXrefGroupWithDifferentLabels = ( +const renderXrefGroup = ( externalReferencesGroup: ExternalReferencesGroup, key: number ) => { @@ -271,7 +238,12 @@ const renderXrefGroupWithDifferentLabels = (
{externalReferencesGroup.references.map((entry, key) => ( {
{gene.symbol} - {gene.id} + {gene.id}
Gene name
diff --git a/src/ensembl/src/content/app/entity-viewer/state/sidebar/sampleData.ts b/src/ensembl/src/content/app/entity-viewer/state/sidebar/sampleData.ts index 765abed4604f1f4aaa639a5de50ccdcfde850b11..5fa06f69b3d7da9a744c4ecdaffbd88d7b3fec09 100644 --- a/src/ensembl/src/content/app/entity-viewer/state/sidebar/sampleData.ts +++ b/src/ensembl/src/content/app/entity-viewer/state/sidebar/sampleData.ts @@ -19,7 +19,7 @@ import { DataSetType } from '../../types/dataSet'; export const entityViewerWheatSampleResponse: EntityViewerSidebarPayload = { gene: { - symbol: 'TraesCS3D02G273600.1 ', + symbol: 'TraesCS3D02G273600.1', id: 'ENSG00000139618.15', metadata: { name: { @@ -380,7 +380,7 @@ export const entityViewerHomoSapiensSampleResponse: EntityViewerSidebarPayload = export const entityViewerBacteriaSampleResponse: EntityViewerSidebarPayload = { gene: { - symbol: 'grpE ', + symbol: 'grpE', id: 'b2614', synonyms: ['b2614', 'ECK2610', 'JW2594'], metadata: { diff --git a/src/ensembl/src/shared/components/external-reference/ExternalReference.scss b/src/ensembl/src/shared/components/external-reference/ExternalReference.scss index 1f42d7bdcce7f85d80d870aac3d3fa1370c7dc6c..06590462e5269e4800e3a086ef4f8e51a4055a15 100644 --- a/src/ensembl/src/shared/components/external-reference/ExternalReference.scss +++ b/src/ensembl/src/shared/components/external-reference/ExternalReference.scss @@ -1,7 +1,6 @@ @import 'src/styles/common'; .label { - grid-column: label; // FIXME: what grid is this? margin-right: 5px; }