Merge pull request #19 from refinery-platform/scottx611x/update_track_metadata

scottx611x · web-flow · commit 6eb99cfc32f5 · 2018-03-22T16:46:53.000-04:00
Scottx611x/update track metadata
diff --git a/context/on_startup.py b/context/on_startup.py
@@ -24,9 +24,8 @@ def write_igv_configuration():
         tracks.append(
             {
                 "name": "{} - {}".format(
-                    node_data["node_solr_info"][
-                        "filename_Characteristics_generic_s"],
-                    node_data["node_solr_info"]["name"]
+                    node_data["node_solr_info"]["name"],
+                    node_data["file_url"]
                 ),
                 "url":  node_data["file_url"]
             }
diff --git a/input_fixtures/good/input.json b/input_fixtures/good/input.json
@@ -32,7 +32,6 @@
         "technology_Characteristics_generic_s": "DNA microarray",
         "measurement_Characteristics_generic_s": "transcription profiling",
         "organism_Characteristics_720_361_s": "Mus musculus",
-        "filename_Characteristics_generic_s": "040909%20DT%20MOUSE%20430%202.0%20Sample%20526.CEL",
         "organism_part_Characteristics_generic_s": "Bone marrow",
         "technology_source_Characteristics_generic_s": "OBI",
         "REFINERY_FILETYPE_720_361_s": "Affymetrix Probe Results File",
diff --git a/input_fixtures/missing_assembly/input.json b/input_fixtures/missing_assembly/input.json
@@ -32,7 +32,6 @@
         "technology_Characteristics_generic_s": "DNA microarray",
         "measurement_Characteristics_generic_s": "transcription profiling",
         "organism_Characteristics_720_361_s": "Mus musculus",
-        "filename_Characteristics_generic_s": "040909%20DT%20MOUSE%20430%202.0%20Sample%20526.CEL",
         "organism_part_Characteristics_generic_s": "Bone marrow",
         "technology_source_Characteristics_generic_s": "OBI",
         "REFINERY_FILETYPE_720_361_s": "Affymetrix Probe Results File",
diff --git a/input_fixtures/no_parameters/input.json b/input_fixtures/no_parameters/input.json
@@ -32,7 +32,6 @@
         "technology_Characteristics_generic_s": "DNA microarray",
         "measurement_Characteristics_generic_s": "transcription profiling",
         "organism_Characteristics_720_361_s": "Mus musculus",
-        "filename_Characteristics_generic_s": "040909%20DT%20MOUSE%20430%202.0%20Sample%20526.CEL",
         "organism_part_Characteristics_generic_s": "Bone marrow",
         "technology_source_Characteristics_generic_s": "OBI",
         "REFINERY_FILETYPE_720_361_s": "Affymetrix Probe Results File",

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,8 @@ def write_igv_configuration():`
`24`	`24`	`tracks.append(`
`25`	`25`	`{`
`26`	`26`	`"name": "{} - {}".format(`
`27`		`- node_data["node_solr_info"][`
`28`		`- "filename_Characteristics_generic_s"],`
`29`		`- node_data["node_solr_info"]["name"]`
	`27`	`+ node_data["node_solr_info"]["name"],`
	`28`	`+ node_data["file_url"]`
`30`	`29`	`),`
`31`	`30`	`"url": node_data["file_url"]`
`32`	`31`	`}`