Skip to content

Commit

Permalink
Merge branch 'cBioPortal:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Nelliney authored Aug 15, 2024
2 parents b47b615 + 0b828d8 commit af82397
Show file tree
Hide file tree
Showing 31 changed files with 820 additions and 61 deletions.
17 changes: 17 additions & 0 deletions OPEN-SOURCE-DOCUMENTATION
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,20 @@ Available under license:
5. Products derived from this software may not be called
"ColorBrewer", nor may "ColorBrewer" appear in their name, without
prior written permission of Cynthia Brewer.

* JavaScript/CSS Font Detector

JavaScript/CSS Font Detector
----------------------------
Available under license:

JavaScript code to detect available availability of a
particular font in a browser using JavaScript and CSS.

Author : Lalit Patel
Website: http://www.lalit.org/lab/javascript-css-font-detect/
License: Apache Software License 2.0
http://www.apache.org/licenses/LICENSE-2.0



57 changes: 28 additions & 29 deletions my-index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,36 @@
window.frontendConfig = {
}
/* REMOVED: This is an example of how to add custom tabs to the patient page. Enabling this will clobber localStorage.frontendConfig that is set through the browser console
localStorage.frontendConfig = JSON.stringify(
{
serverConfig:{
custom_tabs:[
{
title: 'Sync Tab',
id: 'customTab1',
location: 'PATIENT_PAGE',
mountCallback: `(div)=>{
$(div).html("tab for patient " + window.location.search.split("=").slice(-1))
}`,
},
{
title: 'Async Tab',
id: 'customTab2',
location: 'PATIENT_PAGE',
hideAsync: `()=>{
return new Promise((resolve)=>{
setTimeout(()=>{
resolve(true);
}, 2000);
});
}`,
},
]
}
}
);
serverConfig:{
custom_tabs:[
{
title: 'Sync Tab',
id: 'customTab1',
location: 'PATIENT_PAGE',
mountCallback: `(div)=>{
$(div).html("tab for patient " + window.location.search.split("=").slice(-1))
}`,
},
{
title: 'Async Tab',
id: 'customTab2',
location: 'PATIENT_PAGE',
hideAsync: `()=>{
return new Promise((resolve)=>{
setTimeout(()=>{
resolve(true);
}, 2000);
});
}`,
},
]
}
});
*/
function renderCustomTab1(div, tab){
$(div).append(`<div>this is the content for <strong>${tab.title}</strong></div>`);
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cbioportal-frontend",
"private": true,
"version": "3.3.283",
"version": "3.3.284",
"workspaces": {
"packages": [
".",
Expand Down Expand Up @@ -159,10 +159,10 @@
"bootstrap-sass": "3.4.1",
"bowser": "^1.7.1",
"bundle-loader": "^0.5.4",
"cbioportal-clinical-timeline": "^0.3.83",
"cbioportal-frontend-commons": "^0.5.67",
"cbioportal-clinical-timeline": "^0.3.84",
"cbioportal-frontend-commons": "^0.5.68",
"cbioportal-ts-api-client": "^0.9.73",
"cbioportal-utils": "^0.3.41",
"cbioportal-utils": "^0.3.42",
"chart.js": "^2.6.0",
"classnames": "^2.2.5",
"clinical-timeline": "0.0.30",
Expand All @@ -189,7 +189,7 @@
"fmin": "^0.0.2",
"font-awesome": "^4.7.0",
"fork-ts-checker-webpack-plugin": "^6.3.3",
"genome-nexus-ts-api-client": "^1.1.32",
"genome-nexus-ts-api-client": "^1.1.33",
"git-revision-webpack-plugin": "^5.0.0",
"history": "4.10.1",
"html-webpack-plugin": "^5.3.2",
Expand Down Expand Up @@ -227,7 +227,7 @@
"mobx-utils": "6.0.1",
"numeral": "^2.0.6",
"object-sizeof": "^1.2.0",
"oncokb-frontend-commons": "^0.0.25",
"oncokb-frontend-commons": "^0.0.26",
"oncokb-styles": "~1.4.2",
"oncokb-ts-api-client": "^1.3.5",
"oncoprintjs": "^6.0.5",
Expand Down Expand Up @@ -272,7 +272,7 @@
"react-markdown": "^7.0.1",
"react-mfb": "^0.6.0",
"react-motion": "^0.4.7",
"react-mutation-mapper": "^0.8.111",
"react-mutation-mapper": "^0.8.112",
"react-overlays": "0.7.4",
"react-portal": "^4.2.0",
"react-rangeslider": "^2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/cbioportal-clinical-timeline/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cbioportal-clinical-timeline",
"description": "cBioPortal Clinical Timeline",
"version": "0.3.83",
"version": "0.3.84",
"main": "dist/index.js",
"module": "dist/index.es.js",
"jsnext:main": "dist/index.es.js",
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"autobind-decorator": "^2.1.0",
"cbioportal-frontend-commons": "^0.5.67",
"cbioportal-frontend-commons": "^0.5.68",
"lodash": "^4.17.11",
"react-bootstrap": "^0.31.5",
"react-overlays": "0.7.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/cbioportal-frontend-commons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cbioportal-frontend-commons",
"description": "cBioPortal Frontend Modules",
"version": "0.5.67",
"version": "0.5.68",
"main": "dist/index.js",
"module": "dist/index.es.js",
"jsnext:main": "dist/index.es.js",
Expand Down Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"autobind-decorator": "^2.1.0",
"cbioportal-utils": "^0.3.41",
"cbioportal-utils": "^0.3.42",
"classnames": "^2.2.5",
"jquery": "^3.2.1",
"juice": "^10.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/cbioportal-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cbioportal-utils",
"description": "cBioPortal Utilities",
"version": "0.3.41",
"version": "0.3.42",
"main": "dist/index.js",
"module": "dist/index.es.js",
"jsnext:main": "dist/index.es.js",
Expand Down Expand Up @@ -30,7 +30,7 @@
},
"dependencies": {
"buffer": "^6.0.3",
"genome-nexus-ts-api-client": "^1.1.32",
"genome-nexus-ts-api-client": "^1.1.33",
"lodash": "^4.17.15",
"oncokb-ts-api-client": "^1.3.5",
"superagent": "^3.8.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/genome-nexus-ts-api-client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "genome-nexus-ts-api-client",
"description": "Genome Nexus API Client for TypeScript",
"version": "1.1.32",
"version": "1.1.33",
"main": "dist/index.js",
"module": "dist/index.es.js",
"jsnext:main": "dist/index.es.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1348,6 +1348,18 @@
}
}
},
"AlphaMissense": {
"type": "object",
"properties": {
"pathogenicity": {
"type": "string"
},
"score": {
"type": "number",
"format": "double"
}
}
},
"ArticleAbstract": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -3309,6 +3321,9 @@
"transcript_id"
],
"properties": {
"alphaMissense": {
"$ref": "#/definitions/AlphaMissense"
},
"amino_acids": {
"type": "string",
"description": "Amino acids"
Expand Down Expand Up @@ -3413,6 +3428,9 @@
"transcriptId"
],
"properties": {
"alphaMissense": {
"$ref": "#/definitions/AlphaMissense"
},
"aminoAcidAlt": {
"type": "string",
"description": "Alt Amino Acid"
Expand Down Expand Up @@ -3725,6 +3743,9 @@
"variant"
],
"properties": {
"alphaMissense": {
"$ref": "#/definitions/AlphaMissense"
},
"assemblyName": {
"type": "string",
"description": "Assembly name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ export type AlleleNumber = {
export type Alleles = {
'allele': string

};
export type AlphaMissense = {
'pathogenicity': string

'score': number

};
export type ArticleAbstract = {
'abstract': string
Expand Down Expand Up @@ -840,7 +846,9 @@ export type StatsByTumorType = {

};
export type TranscriptConsequence = {
'amino_acids': string
'alphaMissense': AlphaMissense

'amino_acids': string

'canonical': string

Expand Down Expand Up @@ -886,7 +894,9 @@ export type TranscriptConsequence = {

};
export type TranscriptConsequenceSummary = {
'aminoAcidAlt': string
'alphaMissense': AlphaMissense

'aminoAcidAlt': string

'aminoAcidRef': string

Expand Down Expand Up @@ -1026,7 +1036,9 @@ export type VariantAnnotation = {

};
export type VariantAnnotationSummary = {
'assemblyName': string
'alphaMissense': AlphaMissense

'assemblyName': string

'canonicalTranscriptId': string

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,18 @@
}
}
},
"AlphaMissense": {
"type": "object",
"properties": {
"pathogenicity": {
"type": "string"
},
"score": {
"type": "number",
"format": "double"
}
}
},
"Cosmic": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2211,6 +2223,9 @@
"transcriptId"
],
"properties": {
"alphaMissense": {
"$ref": "#/definitions/AlphaMissense"
},
"aminoAcidAlt": {
"type": "string",
"description": "Alt Amino Acid"
Expand Down Expand Up @@ -2306,6 +2321,9 @@
"variant"
],
"properties": {
"alphaMissense": {
"$ref": "#/definitions/AlphaMissense"
},
"assemblyName": {
"type": "string",
"description": "Assembly name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ export type AlleleNumber = {
export type Alleles = {
'allele': string

};
export type AlphaMissense = {
'pathogenicity': string

'score': number

};
export type Cosmic = {
'alt': string
Expand Down Expand Up @@ -542,7 +548,9 @@ export type StatsByTumorType = {

};
export type TranscriptConsequenceSummary = {
'aminoAcidAlt': string
'alphaMissense': AlphaMissense

'aminoAcidAlt': string

'aminoAcidRef': string

Expand Down Expand Up @@ -586,7 +594,9 @@ export type TranscriptConsequenceSummary = {

};
export type VariantAnnotationSummary = {
'assemblyName': string
'alphaMissense': AlphaMissense

'assemblyName': string

'canonicalTranscriptId': string

Expand Down
4 changes: 2 additions & 2 deletions packages/oncokb-frontend-commons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oncokb-frontend-commons",
"version": "0.0.25",
"version": "0.0.26",
"description": "OncoKB Frontend Modules",
"main": "dist/index.js",
"module": "dist/index.es.js",
Expand Down Expand Up @@ -35,7 +35,7 @@
"react-dom": "^15.0.0 || ^16.0.0"
},
"dependencies": {
"cbioportal-utils": "^0.3.41",
"cbioportal-utils": "^0.3.42",
"classnames": "^2.2.5",
"lodash": "^4.17.15",
"oncokb-styles": "~1.4.2",
Expand Down
Loading

0 comments on commit af82397

Please sign in to comment.