Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 17 additions & 3 deletions src/encoded/static/components/filegallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,18 @@ const filterDownloadableFilesByStatus = (context, files) => {
return [];
};

const getElementReferencesFiles = (elementsReferences) => {
let elementsReferenceFiles = [];
if (elementsReferences) {
elementsReferenceFiles = elementsReferences.map((elementsReference) => elementsReference.files)
.reduce((acc, val) => acc.concat(val), [])
.map((elementReferenceFile) => {
elementReferenceFile.isElementReferenceFile = true;
return elementReferenceFile;
});
}
return elementsReferenceFiles;
};

export class FileTable extends React.Component {
static rowClasses() {
Expand Down Expand Up @@ -453,7 +465,7 @@ export class FileTable extends React.Component {
}
return 'rawArray';
}
if (file.output_category === 'reference') {
if (file.output_category === 'reference' || file.isElementReferenceFile) {
return 'ref';
}

Expand Down Expand Up @@ -1470,14 +1482,16 @@ export const FileGallery = ({
});

React.useEffect(() => {
const elementsReferenceFiles = getElementReferencesFiles(context.elements_references);

if (files) {
// Array of files provided, so set without a request to the server.
setData(files);
setData([...files, ...elementsReferenceFiles]);
} else {
// Request files from the server.
const query = fileQuery || `limit=all&type=File&dataset=${context['@id']}`;
requestSearch(query).then((requestedData) => {
setData(requestedData['@graph']);
setData([...requestedData['@graph'], ...elementsReferenceFiles]);
});
}
}, [fileQuery, files]);
Expand Down
1 change: 1 addition & 0 deletions src/encoded/types/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,7 @@ class FunctionalCharacterizationSeries(Series):
'related_datasets.elements_references.examined_loci',
'elements_references',
'elements_references.examined_loci',
'elements_references.files',
]

@calculated_property(condition='related_datasets', schema={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class FunctionalCharacterizationExperiment(
'biosample_ontology',
'examined_loci',
'examined_loci.gene',
'elements_references.files',
'elements_references.examined_loci',
'elements_references.examined_regions',
'files.platform',
Expand Down