Merge branch 'release-2.12.x' into TASK-5708

opencb · Apr 2, 2024 · 2a94fe8 · 2a94fe8
2 parents bc6d8fd + e45cea1
commit 2a94fe8
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 159 deletions.
diff --git a/src/core/bioinfo/bioinfo-utils.js b/src/core/bioinfo/bioinfo-utils.js
@@ -34,6 +34,23 @@ export default class BioinfoUtils {
         });
     }
 
+    static getIdName(id, name) {
+        let text = "";
+        if (name) {
+            text = name;
+        }
+
+        if (id) {
+            if (name) {
+                text += ` (${id})`;
+            } else {
+                text = id;
+            }
+        }
+
+        return text;
+    }
+
     // Generate Variant ID in Varsome format
     // https://varsome.com/how-do-i-create-link-varsome/
     static getVariantInVarsomeFormat(variantId) {
@@ -255,7 +272,7 @@ export default class BioinfoUtils {
 
     static getOboLink(ontologyId) {
         const ontologyShort = ontologyId.replace(":", "_");
-        return `http://purl.obolibrary.org/obo/${ontologyShort}`;
+        return `https://purl.obolibrary.org/obo/${ontologyShort}`;
     }
 
     static getHpoLink(hpoTerm) {

diff --git a/src/webcomponents/commons/filters/sample-genotype-filter.js b/src/webcomponents/commons/filters/sample-genotype-filter.js
@@ -85,17 +85,20 @@ export default class SampleGenotypeFilter extends LitElement {
                     id: "0/1", name: "HET"
                 },
                 {
-                    id: "1/1", name: "HOM ALT"
+                    id: "1/1", name: "HOM_ALT"
                 },
                 {
                     separator: true
                 },
                 {
-                    id: "./.", name: "Missing"
+                    id: "1/2", name: "BIALLELIC (1/2)"
                 },
-                {
-                    id: "NA", name: "NA"
-                }
+                // {
+                //     id: "./.", name: "Missing"
+                // },
+                // {
+                //     id: "NA", name: "NA"
+                // }
             ]
         };
     }