diff --git a/app/scripts/files/files.controllers.ts b/app/scripts/files/files.controllers.ts index 08b7c9a17..2f2e86634 100755 --- a/app/scripts/files/files.controllers.ts +++ b/app/scripts/files/files.controllers.ts @@ -33,12 +33,12 @@ module ngApp.files.controllers { CoreService.setPageTitle("File", file.file_name); var toDisplayLogic = { - 'Raw Sequencing Data': ['workflow', 'referenceGenome', 'readGroup', 'downstreamAnalysis'], - 'Transcriptome Profiling': ['workflow', 'referenceGenome', 'downstreamAnalysis'], - 'Simple Nucleotide Variation': ['workflow', 'referenceGenome', 'downstreamAnalysis'], - 'Copy Number Variation': ['workflow', 'referenceGenome', 'downstreamAnalysis'], - 'Structural Rearrangement': ['workflow', 'referenceGenome', 'downstreamAnalysis'], - 'DNA Methylation': ['workflow', 'referenceGenome', 'downstreamAnalysis'], + 'Raw Sequencing Data': ['analysis', 'referenceGenome', 'readGroup', 'downstreamAnalysis'], + 'Transcriptome Profiling': ['analysis', 'referenceGenome', 'downstreamAnalysis'], + 'Simple Nucleotide Variation': ['analysis', 'referenceGenome', 'downstreamAnalysis'], + 'Copy Number Variation': ['analysis', 'referenceGenome', 'downstreamAnalysis'], + 'Structural Rearrangement': ['analysis', 'referenceGenome', 'downstreamAnalysis'], + 'DNA Methylation': ['analysis', 'referenceGenome', 'downstreamAnalysis'], 'Clinical': [], 'Biospecimen': [] } diff --git a/app/scripts/files/templates/file.html b/app/scripts/files/templates/file.html index 1192dbc52..2aa8b4e53 100755 --- a/app/scripts/files/templates/file.html +++ b/app/scripts/files/templates/file.html @@ -166,21 +166,21 @@

No Cases Found.

- -
- -
+ +
+ +
-

Workflow

+

Analysis

-

No Workflow found.

+

No Analyses found.

- @@ -346,7 +346,7 @@

No Downstream Analyses Files Found.

- + diff --git a/app/scripts/search/search.files.table.model.ts b/app/scripts/search/search.files.table.model.ts index 03891a5cb..8950cd653 100644 --- a/app/scripts/search/search.files.table.model.ts +++ b/app/scripts/search/search.files.table.model.ts @@ -168,6 +168,7 @@ module ngApp.search.models { {name: "data_category", title: "Data Category", collapsed: false, facetType: "terms", removable: false }, {name: "data_type", title: "Data Type", collapsed: false, facetType: "terms", removable: false }, {name: "experimental_strategy", title: "Experimental Strategy", collapsed: false, facetType: "terms", removable: false }, + {name: "analysis.workflow_type", title: "Workflow Type", collapsed: false, facetType: "terms", removable: false }, {name: "data_format", title: "Data Format", collapsed: false, facetType: "terms", removable: false }, {name: "platform", title: "Platform", collapsed: false, facetType: "terms", removable: false }, {name: "access", title: "Access Level", collapsed: false, facetType: "terms", removable: false },
Data Category Data Type Data FormatAnalysis WorkflowAnalysis workflow File Size Action