Merge branch 'main' into update-linting

frontend/src/api/associations.ts

@@ -14,15 +14,35 @@ export const getAssociations = async (
   sort: Sort = null,
 ) => {
   /** make query params */
+  let sortBy = sort?.key;
+
+  /**
+   * Sorting by frequency_qualifier is a special case. Those terms are entities
+   * like HP:0040280 ("Always present"), and are only one out of three ways to
+   * represent the frequency of a phenotypic association. The other two are a
+   * ratio and a percentage. To sort all three values at the same time, we have
+   * a derived column in the index that unifies all of these representation
+   * called `frequency_computed_sortable_float`.
+   *
+   * This replacement could be done on /any/ frequency key (has_percentage,
+   * has_count, has_total), but for now, we only use frequency qualifier in the
+   * table.
+   *
+   * This could end up being a bug if someone /actually/, /really/ wanted to
+   * only sort by the frequency qualifier, and have the other two classes show
+   * up as null.
+   */
+  if (sortBy === "frequency_qualifier") {
+    sortBy = "frequency_computed_sortable_float";
+  }
+
   const params = {
     offset,
     limit,
     query: search || "",
     traverse_orthologs: !!traverseOrthologs,
     direct: direct,
-    sort: sort
-      ? `${sort.key} ${sort.direction === "up" ? "asc" : "desc"}`
-      : null,
+    sort: sort ? `${sortBy} ${sort.direction === "up" ? "asc" : "desc"}` : null,
   };
 
   /** make query */
@@ -45,14 +65,20 @@ export const downloadAssociations = async (
   sort: Sort = null,
 ) => {
   /** make query params */
+
+  let sortBy = sort?.key;
+
+  /** See comment in getAssociations() */
+  if (sortBy === "frequency_qualifier") {
+    sortBy = "frequency_computed_sortable_float";
+  }
+
   const params = {
     limit: maxDownload,
     query: search || "",
     traverse_orthologs: !!traverseOrthologs,
     direct: direct,
-    sort: sort
-      ? `${sort.key} ${sort.direction === "up" ? "asc" : "desc"}`
-      : null,
+    sort: sort ? `${sortBy} ${sort.direction === "up" ? "asc" : "desc"}` : null,
     download: true,
     format: "tsv",
   };

frontend/src/pages/node/AssociationsTable.vue

@@ -57,7 +57,7 @@
 
     <template #frequency="{ row }">
       <AppPercentage
-        v-if="frequencyPercentage(row) !== undefined"
+        v-if="frequencyPercentage(row) != undefined"
         type="bar"
         :percent="frequencyPercentage(row) || 0"
         :tooltip="frequencyTooltip(row)"
@@ -357,14 +357,14 @@ async function download() {
 /** get phenotype frequency percentage 0-1 */
 const frequencyPercentage = (row: DirectionalAssociation) => {
   /** frequency from % out of 100 */
-  if (row.has_percentage !== undefined) return row.has_percentage / 100;
+  if (row.has_percentage != undefined) return row.has_percentage / 100;
 
   /** frequency from ratio */
-  if (row.has_count !== undefined && row.has_total !== undefined) {
+  if (row.has_count != undefined && row.has_total != undefined) {
     return row.has_count / row.has_total;
   }
   /** enumerated frequencies */
-  if (row.frequency_qualifier !== undefined)
+  if (row.frequency_qualifier != undefined)
     switch (row.frequency_qualifier) {
       case "HP:0040280":
         return 1;
@@ -384,12 +384,12 @@ const frequencyPercentage = (row: DirectionalAssociation) => {
 /** get frequency tooltip */
 const frequencyTooltip = (row: DirectionalAssociation) => {
   // display fraction if possible
-  if (row.has_count !== undefined && row.has_total !== undefined) {
+  if (row.has_count != undefined && row.has_total != undefined) {
     return `${row.has_count} of ${row.has_total} cases`;
   }
 
   // if percentage is present but fraction isn't, that's what was originally in the data
-  if (row.has_percentage !== undefined && row.has_total !== undefined) {
+  if (row.has_percentage != undefined && row.has_total != undefined) {
     return `${row.has_percentage.toFixed(0)}%`;
   }
   // if no percentage or fraction, display the qualifier label