minor refactoring

genenetwork · Nov 9, 2022 · ee09525 · ee09525
1 parent 3781312
commit ee09525
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py
@@ -53,8 +53,6 @@ def set_template_vars(start_vars, correlation_data):
     correlation_data['table_json'] = correlation_json_for_table(
         start_vars,
         correlation_data,
-        correlation_data['this_trait'],
-        correlation_data['this_dataset'],
         target_dataset_ob)
 
     if target_dataset_ob.type == "ProbeSet":
@@ -261,7 +259,7 @@ def __populate_trait__(idx, trait):
             for (idx, trait) in enumerate(corr_results)]
 
 
-def correlation_json_for_table(start_vars, correlation_data, this_trait, this_dataset, target_dataset_ob):
+def correlation_json_for_table(start_vars, correlation_data, target_dataset_ob):
     """Return JSON data for use with the DataTable in the correlation result page
 
     Keyword arguments:
@@ -270,21 +268,17 @@ def correlation_json_for_table(start_vars, correlation_data, this_trait, this_da
     this_dataset -- Dataset of this_trait, as a dict
     target_dataset_ob - Target dataset, as a Dataset ob
     """
-    this_trait = correlation_data['this_trait']
-    this_dataset = correlation_data['this_dataset']
-    target_dataset = target_dataset_ob.as_dict()
-    corr_results = correlation_data['correlation_results']
 
-    dataset_metadata = generate_table_metadata({name for trait in corr_results
+    dataset_metadata = generate_table_metadata({name for trait in correlation_data['correlation_results']
                                                 for (name, _val) in trait.items()},
                                                correlation_data["traits_metadata"],
                                                target_dataset_ob)
-
-    results = populate_table(dataset_metadata,
-                             target_dataset,
-                             this_dataset, corr_results,
-                             get_user_filters(start_vars))
-    return json.dumps([result for result in results if result])
+    return json.dumps([result for result in (
+        populate_table(dataset_metadata=dataset_metadata,
+                       target_dataset=target_dataset_ob.as_dict(),
+                       this_dataset=correlation_data['this_dataset'],
+                       corr_results=correlation_data['correlation_results'],
+                       filters=get_user_filters(start_vars))) if result])
 
 
 def get_formatted_corr_type(corr_type, corr_method):