-
Notifications
You must be signed in to change notification settings - Fork 51
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.
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
ENCD-6126--add-element-ref-to-file-details #4084
Open
zoldello
wants to merge
10
commits into
dev
Choose a base branch
from
ENCD-6126--add-element-ref-to-file-details
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a77926e
ENCD-6126--add-element-ref-to-file-details
zoldello 433784f
fix issue with file.ref not being defined
zoldello 1cd0f4b
fixed ref
zoldello 149381a
t
zoldello 5120ce9
t
zoldello 24631fb
removed check for empty file.href
zoldello cf51ecf
t
zoldello d979f41
fixed elementReference error
zoldello 6dc1ef8
fixed context
zoldello 5d22b14
t
zoldello File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -463,6 +463,18 @@ export class FileTable extends React.Component { | |
return analysisObjectsAccession || nonAnalysisObjectPrefix; | ||
}); | ||
|
||
const elementsReferences = context.elements_references; | ||
|
||
if (elementsReferences) { | ||
const elementsReferenceFiles = elementsReferences.map((elementsReference) => elementsReference.files).reduce((acc, val) => acc.concat(val), []); | ||
|
||
if (!files.ref) { | ||
files.ref = []; | ||
} | ||
|
||
files.ref.push(...elementsReferenceFiles); | ||
} | ||
|
||
// Get unique analyses for series object | ||
const analysesSeries = files.series ? [...new Set(files.series.map((a) => (a.analyses && a.analyses.length > 0 ? a.analyses[0] : '')).filter((a) => a !== ''))] : []; | ||
|
||
|
@@ -2975,7 +2987,9 @@ class FileGalleryRendererComponent extends React.Component { | |
this.experimentType = props.context['@type'][0]; | ||
|
||
const seriesFiles = getSeriesFiles(props.context) || []; | ||
const datasetFiles = [...props.data, ...seriesFiles]; | ||
const elementsReferenceFiles = props.context.elements_references?.map((elementsReference) => elementsReference.files).reduce((acc, val) => acc.concat(val), []) || []; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe move this into a utility function shared here and in your first change above? They do the same thing, and a well-named utility function would help documentation. |
||
|
||
const datasetFiles = [...props.data, ...seriesFiles, ...elementsReferenceFiles]; | ||
|
||
// Initialize React state variables. | ||
this.state = { | ||
|
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see what you’re doing, though I think it’d be easier to understand in one step: