Merge pull request #82 from onursumer/initial-multi-sort

Fix minor gene page issues

package.json

@@ -20,8 +20,8 @@
     "@types/superagent": "^4.1.1",
     "autobind-decorator": "^2.4.0",
     "bootstrap": "^4.3.1",
-    "cbioportal-frontend-commons": "^0.3.14",
-    "cbioportal-utils": "^0.2.12-beta.0",
+    "cbioportal-frontend-commons": "^0.3.15",
+    "cbioportal-utils": "^0.2.12",
     "classnames": "^2.2.6",
     "csvtojson": "^2.0.10",
     "d3-scale": "^3.2.1",
@@ -38,7 +38,7 @@
     "react-bootstrap": "^1.0.0-beta.6",
     "react-dom": "^16.8.6",
     "react-highlight-words": "^0.16.0",
-    "react-mutation-mapper": "^0.6.16-beta.1",
+    "react-mutation-mapper": "^0.6.19",
     "react-router-bootstrap": "^0.24.4",
     "react-router-dom": "^4.3.1",
     "react-select": "^3.1.0",

src/components/GeneFrequencyTable.tsx

@@ -126,8 +126,7 @@ class GeneFrequencyTable extends React.Component<IFrequencyTableProps>
                         }
                     ]}
                     initialItemsPerPage={10}
-                    initialSortColumn={ColumnId.GERMLINE}
-                    initialSortDirection={ColumnSortDirection.DESC}
+                    initialSort={[{column: ColumnId.GERMLINE, sortDirection: ColumnSortDirection.DESC}]}
                     showColumnVisibility={false}
                     searchPlaceholder="Search Gene"
                 />

src/components/MutationMapper.tsx

@@ -241,8 +241,13 @@ class MutationMapper extends React.Component<IMutationMapperProps> {
                 customMutationTableProps={{
                     SubComponent: this.renderSubComponent
                 }}
-                mutationTableInitialSortColumn={MutationColumn.PROTEIN_CHANGE}
-                mutationTableInitialSortDirection={ColumnSortDirection.ASC}
+                // default mutation table waits for annotation column data by default to initiate sort
+                // we don't sort by annotation column, so setting this to an empty array to bypass the initial wait
+                mutationTableInitialSortRemoteData={[]}
+                mutationTableInitialSort={[
+                    {column: MutationColumn.MUTATION_STATUS, sortDirection: ColumnSortDirection.ASC},
+                    {column: MutationColumn.PROTEIN_CHANGE, sortDirection: ColumnSortDirection.ASC},
+                ]}
                 groupFilters={
                     [
                         {

src/util/FilterUtils.ts

@@ -131,6 +131,7 @@ export function findMutationTypeFilter(dataFilters: DataFilter[])
 
 export function getDefaultMutationStatusFilterValues() {
     return [
+        MutationStatusFilterValue.SOMATIC,
         MutationStatusFilterValue.PATHOGENIC_GERMLINE
     ];
 }

yarn.lock

@@ -2153,6 +2153,32 @@ cbioportal-frontend-commons@^0.3.13, cbioportal-frontend-commons@^0.3.14:
     url "^0.11.0"
     victory "30.0.0"
 
+cbioportal-frontend-commons@^0.3.15:
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/cbioportal-frontend-commons/-/cbioportal-frontend-commons-0.3.15.tgz#27ed8804338770069a2157d7477d4a553e0081f2"
+  integrity sha512-aDRwKrjGXPLCTltryik8aU0bAyJCKsrKq9sCx9IGbOVI5Rfpu+Psdl8m/C41znGdHzFso0ug+o4MYZI3xw4/EQ==
+  dependencies:
+    autobind-decorator "^2.1.0"
+    cbioportal-utils "^0.2.12"
+    classnames "^2.2.5"
+    jquery "^3.2.1"
+    lodash "^4.17.11"
+    measure-text "0.0.4"
+    mobxpromise "github:cbioportal/mobxpromise#v1.0.2"
+    object-sizeof "^1.2.0"
+    oncokb-ts-api-client "^1.1.3"
+    rc-tooltip "3.7.3"
+    react-file-download "^0.3.2"
+    react-overlays "0.7.4"
+    react-select "^3.0.4"
+    save-svg-as-png "^1.4.6"
+    seamless-immutable "^7.0.1"
+    superagent "^3.8.3"
+    svg2pdf.js "^1.3.3"
+    typescript "4.0.3"
+    url "^0.11.0"
+    victory "30.0.0"
+
 cbioportal-utils@^0.2.10, cbioportal-utils@^0.2.11:
   version "0.2.11"
   resolved "https://registry.yarnpkg.com/cbioportal-utils/-/cbioportal-utils-0.2.11.tgz#406cf473c337ca71195e71395378b7094155c306"
@@ -2164,10 +2190,10 @@ cbioportal-utils@^0.2.10, cbioportal-utils@^0.2.11:
     superagent "^3.8.3"
     typescript "4.0.3"
 
-cbioportal-utils@^0.2.12-beta.0:
-  version "0.2.12-beta.0"
-  resolved "https://registry.yarnpkg.com/cbioportal-utils/-/cbioportal-utils-0.2.12-beta.0.tgz#2667189f1f7e9e60f5cdc461e06d3cb863e2d823"
-  integrity sha512-J6n7j7Oeov9qgsfJN+NyknOYa6EKHi2yaz33xjW49E68Wq2sxi1LnPvG4rUTT5QZoE0Mq+H1KsSTQykiU8kEKg==
+cbioportal-utils@^0.2.12:
+  version "0.2.12"
+  resolved "https://registry.yarnpkg.com/cbioportal-utils/-/cbioportal-utils-0.2.12.tgz#4aaf5949b085abc065b1d0a0c013c74e234e4496"
+  integrity sha512-QlujxKiSaofVeDduV4/JFq/RdNNWhCyC6gXFsCGpnAt0xeC7RUxCpEmobtwyHEM7Iogvz9IwoT89lTAAP73zkg==
   dependencies:
     genome-nexus-ts-api-client "^1.1.9"
     lodash "^4.17.11"
@@ -8151,14 +8177,14 @@ react-mutation-mapper@^0.6.14:
     superagent "^3.8.3"
     typescript "4.0.3"
 
-react-mutation-mapper@^0.6.16-beta.1:
-  version "0.6.16-beta.1"
-  resolved "https://registry.yarnpkg.com/react-mutation-mapper/-/react-mutation-mapper-0.6.16-beta.1.tgz#ac7ead8233c2ce2c563cf4cc3b24c661262252b6"
-  integrity sha512-8jnXfyvaUpDRJYzMSI6qQr91oAbj0Bzdoo6U4mIK6miNNnWmoKGjhZbXTM9hWLhK+niNzqzEeINvU0+q6Pvj1A==
+react-mutation-mapper@^0.6.19:
+  version "0.6.19"
+  resolved "https://registry.yarnpkg.com/react-mutation-mapper/-/react-mutation-mapper-0.6.19.tgz#bbfcc49e22641792ef8ec792c0994dbb88f4bf1e"
+  integrity sha512-dQ+zEsWE5nRsKjCBKcJ0x60e1OOjtU5TBlMgm19KKGO0bulMj1HWzPVWiSPobfEFpRGjsK9zhfZ7qbuM/V3dmg==
   dependencies:
     autobind-decorator "^2.1.0"
-    cbioportal-frontend-commons "^0.3.14"
-    cbioportal-utils "^0.2.12-beta.0"
+    cbioportal-frontend-commons "^0.3.15"
+    cbioportal-utils "^0.2.12"
     classnames "^2.2.5"
     genome-nexus-ts-api-client "^1.1.9"
     jquery "^3.2.1"