Merge pull request #390 from zhx828/bug-fix

Show all available gene type

Author: zhx828

k8s/oncokb-public-local.yml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: oncokb-public
-          image: cbioportal/oncokb-public:2.2.3
+          image: cbioportal/oncokb-public:2.2.4
           env:
             - name: SPRING_PROFILES_ACTIVE
               value: prod,no-liquibase

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.mskcc.cbio.oncokb</groupId>
     <artifactId>public-website</artifactId>
-    <version>2.2.3</version>
+    <version>2.2.4</version>
     <packaging>jar</packaging>
     <name>OncoKB Public Website</name>
 
@@ -602,7 +602,7 @@
                             <image>adoptopenjdk:11-jre-hotspot</image>
                         </from>
                         <to>
-                            <image>cbioportal/oncokb-public:2.2.3</image>
+                            <image>cbioportal/oncokb-public:2.2.4</image>
                         </to>
                         <container>
                             <entrypoint>

src/main/docker/app.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   oncokb-app:
-    image: cbioportal/oncokb-public:2.2.3
+    image: cbioportal/oncokb-public:2.2.4
     environment:
       - _JAVA_OPTIONS=-Xmx512m -Xms256m
       - SPRING_PROFILES_ACTIVE=prod,swagger

src/main/webapp/app/pages/genePage/GenePage.tsx

@@ -58,7 +58,8 @@ const getGeneTypeSentence = (oncogene: boolean, tsg: boolean) => {
   const geneTypes = [];
   if (oncogene) {
     geneTypes.push(GENE_TYPE_DESC.ONCOGENE);
-  } else if (tsg) {
+  }
+  if (tsg) {
     geneTypes.push(GENE_TYPE_DESC.TUMOR_SUPPRESSOR);
   }
   return geneTypes.join(', ');
@@ -365,7 +366,9 @@ export default class GenePage extends React.Component<
         <OncoKBTable
           data={this.store.filteredClinicalAlterations}
           pageSize={
-            this.store.filteredClinicalAlterations.length === 0 ? 1 : this.store.filteredClinicalAlterations.length
+            this.store.filteredClinicalAlterations.length === 0
+              ? 1
+              : this.store.filteredClinicalAlterations.length
           }
           columns={this.clinicalTableColumns}
           style={
@@ -395,7 +398,9 @@ export default class GenePage extends React.Component<
           data={this.store.filteredBiologicalAlterations}
           columns={this.biologicalTableColumns}
           pageSize={
-            this.store.filteredBiologicalAlterations.length === 0 ? 1 : this.store.filteredBiologicalAlterations.length
+            this.store.filteredBiologicalAlterations.length === 0
+              ? 1
+              : this.store.filteredBiologicalAlterations.length
           }
           style={
             this.store.filteredBiologicalAlterations.length >