Skip to content
This repository has been archived by the owner on Jul 9, 2024. It is now read-only.

Commit

Permalink
fix(app): Update facets displayed/order.
Browse files Browse the repository at this point in the history
Closes #610
Matthew Schranz committed Mar 17, 2015
1 parent 3acb792 commit 91a5d34
Showing 4 changed files with 20 additions and 27 deletions.
18 changes: 6 additions & 12 deletions app/scripts/annotations/templates/annotations.facets.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
<facets-free-text data-field="annotation_id" data-title="Annotation" placeholder="{{ 'Annotation ID' | translate }}"
entity="annotations"
data-template="components/facets/templates/typeahead-annotations.html"></facets-free-text>
<terms data-name="annotations.project.program.name"
data-title="Program"
data-facet="asc.annotations.aggregations['project.program.name']" data-collapsed="true"></terms>
<terms data-name="annotations.project.project_id"
data-title="Project"
data-facet="asc.annotations.aggregations['project.project_id']" data-collapsed="true"></terms>
entity="annotations"
data-template="components/facets/templates/typeahead-annotations.html"></facets-free-text>
<terms data-name="annotations.project.primary_site"
data-title="Primary Site"
data-facet="asc.annotations.aggregations['project.primary_site']" data-collapsed="true"></terms>
data-facet="asc.annotations.aggregations['project.primary_site']"></terms>
<terms data-name="annotations.project.project_id"
data-title="Project"
data-facet="asc.annotations.aggregations['project.project_id']"></terms>
<terms data-name="annotations.entity_type"
data-title="Entity Type"
data-facet="asc.annotations.aggregations['entity_type']"></terms>
@@ -19,7 +16,4 @@
<terms data-name="annotations.classification"
data-title="Annotation Classification"
data-facet="asc.annotations.aggregations.classification"></terms>
<terms data-name="annotations.status"
data-title="Status"
data-facet="asc.annotations.aggregations.status"></terms>

6 changes: 3 additions & 3 deletions app/scripts/projects/templates/projects.facets.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<facets-free-text data-title="Project" field="project_id" placeholder="{{ 'Project Name or ID' | translate }}"
data-entity="projects"
data-template="components/facets/templates/typeahead-projects.html"></facets-free-text>
<terms data-name="disease_type" data-title="Disease Type"
data-facet="prsc.projects.aggregations.disease_type"></terms>
<terms data-name="primary_site"
data-facet="prsc.projects.aggregations.primary_site" data-title="Primary Site"></terms>
<terms data-name="program.name"
data-facet="prsc.projects.aggregations['program.name']" data-title="Program"></terms>
data-facet="prsc.projects.aggregations['program.name']" data-title="Cancer Program"></terms>
<terms data-name="disease_type" data-title="Disease Type"
data-facet="prsc.projects.aggregations.disease_type"></terms>
<terms data-name="summary.data_types.data_type"
data-facet="prsc.projects.aggregations['summary.data_types.data_type']" data-title="Data Type"></terms>
<terms data-name="summary.experimental_strategies.experimental_strategy"
2 changes: 1 addition & 1 deletion app/scripts/search/templates/search.files.facets.html
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<terms data-name="files.data_type" data-title="Data Type" data-facet="sc.files.aggregations.data_type"></terms>
<terms data-name="files.data_subtype" data-title="Data Subtype" data-facet="sc.files.aggregations.data_subtype"></terms>
<terms data-name="files.experimental_strategy" data-title="Experimental Strategy" data-facet="sc.files.aggregations.experimental_strategy"></terms>
<terms data-name="files.data_format" data-title="Data Format" data-facet="sc.files.aggregations.data_format" data-collapsed="true"></terms>
<terms data-name="files.data_format" data-title="Data Format" data-facet="sc.files.aggregations.data_format"></terms>
<terms data-name="files.origin" data-title="File Origin" data-facet="sc.files.aggregations.origin" data-collapsed="true"></terms>
<terms data-name="files.platform" data-title="Platform" data-facet="sc.files.aggregations.platform" data-collapsed="true"></terms>
<terms data-name="files.access" data-title="Access Level" data-facet="sc.files.aggregations.access" data-collapsed="true"></terms>
21 changes: 10 additions & 11 deletions app/scripts/search/templates/search.participants.facets.html
Original file line number Diff line number Diff line change
@@ -2,23 +2,22 @@
data-field="participants.participant_id"
data-entity="participants"
data-template="components/facets/templates/typeahead-participants.html"></facets-free-text>
<terms data-name="participants.project.primary_site" data-title="Primary Site"
data-facet="sc.participants.aggregations['project.primary_site']"></terms>
<terms data-name="participants.project.program.name" data-title="Cancer Program"
data-facet="sc.participants.aggregations['project.program.name']" data-collapsed="true"></terms>
data-facet="sc.participants.aggregations['project.program.name']"></terms>
<terms data-name="participants.project.project_id" data-title="Project"
data-facet="sc.participants.aggregations['project.project_id']"></terms>
<terms data-name="participants.project.name" data-title="Disease Type"
data-facet="sc.participants.aggregations['project.name']" data-collapsed="true"></terms>
<terms data-name="participants.project.primary_site" data-title="Primary Site"
data-facet="sc.participants.aggregations['project.primary_site']"></terms>
<terms data-name="participants.clinical.gender" data-title="Gender" data-facet="sc.participants.aggregations['clinical.gender']"
data-facet="sc.participants.aggregations['project.name']"></terms>
<terms data-name="participants.clinical.gender" data-title="Gender"
data-facet="sc.participants.aggregations['clinical.gender']"
data-collapsed="true"></terms>
<terms data-name="participants.clinical.vital_status" data-title="Vital Status"
data-facet="sc.participants.aggregations['clinical.vital_status']"></terms>
<terms data-name="participants.stage_event.pathologic_stage" data-title="Pathologic Stage"
data-facet="sc.participants.aggregations['stage_event.pathologic_stage']" data-collapsed="true"></terms>
<terms data-name="participants.histological_type" data-title="Histological Type"
data-facet="sc.participants.aggregations.histological_type"></terms>
<terms data-name="participants.clinical.race" data-title="Race" data-facet="sc.participants.aggregations['clinical.race']"
data-facet="sc.participants.aggregations['clinical.vital_status']"
data-collapsed="true"></terms>
<terms data-name="participants.clinical.race" data-title="Race"
data-facet="sc.participants.aggregations['clinical.race']"
data-collapsed="true"></terms>
<terms data-name="participants.clinical.ethnicity" data-title="Ethnicity"
data-facet="sc.participants.aggregations['clinical.ethnicity']" data-collapsed="true"></terms>

0 comments on commit 91a5d34

Please sign in to comment.