Skip to content

Commit

Permalink
Automated release-3.0.0 to rc merge
Browse files Browse the repository at this point in the history 
Former-commit-id: e11bce808a810fed96834927ff38b2f045bf1cf2
  • Loading branch information
@inodb
inodb authored May 9, 2019
2 parents 5c68320 + 3d076b6 commit 879d87f
Show file tree
Hide file tree
Showing 14 changed files with 1,065 additions and 552 deletions.
2 changes: 1 addition & 1 deletion end-to-end-tests/image-compare/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function buildDisplay(ref, rootUrl){
</div>
<div style="position:relative" class="imgs"><img style="border:1px solid;" src="${data.refImagePath}"/>
<img style="border:1px solid; position:absolute;left:0" src="${data.screenImagePath}"/>
<img style="border:1px solid; position:absolute;left:0;top:0" src="${data.screenImagePath}"/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion env/beta.sh
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export CBIOPORTAL_URL="http://test.cbioportal.org/beta"
export CBIOPORTAL_URL="https://beta.cbioportal.org"
export GENOME_NEXUS_URL="https://www.genomenexus.org"
2 changes: 1 addition & 1 deletion env/release-3.0.0.sh
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export CBIOPORTAL_URL="http://test.cbioportal.org/beta"
export CBIOPORTAL_URL="https://beta.cbioportal.org"
export GENOME_NEXUS_URL="https://www.genomenexus.org"
1 change: 1 addition & 0 deletions my-index.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<script src="/reactapp/common.bundle.js"></script>

<link href="/reactapp/prefixed-bootstrap.min.css" rel="stylesheet"></link>
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css" rel="stylesheet" />
</head>
<body>

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
"babel-register": "^6.22.0",
"better-react-spinkit": "^2.0.0-6",
"bind-decorator": "^1.0.11",
"bootstrap": "^3.3.7",
"bootstrap": "3.3.7",
"bootstrap-loader": "^1.2.0-beta.1",
"bootstrap-sass": "^3.3.7",
"bootstrap-sass": "3.3.7",
"bowser": "^1.7.1",
"bundle-loader": "^0.5.4",
"chart.js": "^2.6.0",
Expand Down
1,048 changes: 523 additions & 525 deletions src/globalStyles/prefixed-bootstrap.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/globalStyles/prefixed-bootstrap.min.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/globalStyles/variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* Colors */
$mutationColor: blue;

$font-size-base: 13px !default;
$font-size-base: 14px !default;

$main-bg: #f5f5f5;

Expand Down
20 changes: 16 additions & 4 deletions src/pages/resultsView/enrichments/MiniFrequencyScatterChart.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {formatLogOddsRatio} from "../../../shared/lib/FormatUtils";
import {toConditionalPrecision} from "../../../shared/lib/NumberUtils";
import SelectionComponent from "./SelectionComponent";
import HoverablePoint from "./HoverablePoint";
import {truncateWithEllipsis} from "../../../shared/lib/wrapText";
import {getTextWidth, truncateWithEllipsis} from "../../../shared/lib/wrapText";

export interface IMiniFrequencyScatterChartData {
x:number;
Expand Down Expand Up @@ -57,12 +57,23 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
this.props.onSelectionCleared();
}

@computed get maxLabelWidth() {
const totalLabelWidths = getTextWidth(this.props.xGroupName, "Arial", "13px") +
getTextWidth(this.props.yGroupName, "Arial", "13px");

if (totalLabelWidths > 150) {
return 75;
} else {
return 90;
}
}

@computed get xLabel() {
return `Alteration Frequency in ${truncateWithEllipsis(this.props.xGroupName, 100, "Arial", "13px")} (%)`;
return `Altered Frequency in ${truncateWithEllipsis(this.props.xGroupName, this.maxLabelWidth, "Arial", "13px")} (%)`;
}

@computed get yLabel() {
return `Alteration Frequency in ${truncateWithEllipsis(this.props.yGroupName, 100, "Arial", "13px")} (%)`;
return `Altered Frequency in ${truncateWithEllipsis(this.props.yGroupName, this.maxLabelWidth, "Arial", "13px")} (%)`;
}

/*@computed get size() {
Expand Down Expand Up @@ -173,7 +184,8 @@ export default class MiniFrequencyScatterChart extends React.Component<IMiniFreq
<div className="posRelative">
<div className="borderedChart inlineBlock" style={{position:"relative"}} onClick={this.onClick}>
<VictoryChart containerComponent={this.containerComponent} theme={CBIOPORTAL_VICTORY_THEME}
domainPadding={20} height={350} width={350} padding={{ top: 40, bottom: 60, left: 60, right: 40 }}>
domainPadding={20} height={350} width={350} padding={{ top: 40, bottom: 60, left: 60, right: 40 }}
>
<VictoryAxis tickValues={[0,25,50,75]} domain={[0,this.plotDomainMax]}
label={this.xLabel}
style={{
Expand Down
145 changes: 145 additions & 0 deletions src/shared/api/generated/CBioPortalAPIInternal-docs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
"name": "Cosmic Counts",
"description": " "
},
{
"name": "Data Access Tokens",
"description": " "
},
{
"name": "Expression Enrichments",
"description": " "
Expand Down Expand Up @@ -458,6 +462,127 @@
}
}
},
"/data-access-tokens": {
"get": {
"tags": [
"Data Access Tokens"
],
"summary": "getAllDataAccessTokens",
"operationId": "getAllDataAccessTokensUsingGET",
"produces": [
"*/*"
],
"responses": {
"200": {
"description": "OK",
"schema": {
"type": "array",
"items": {
"$ref": "#/definitions/DataAccessToken"
}
}
}
}
},
"post": {
"tags": [
"Data Access Tokens"
],
"summary": "createDataAccessToken",
"operationId": "createDataAccessTokenUsingPOST",
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"parameters": [
{
"name": "allowRevocationOfOtherTokens",
"in": "query",
"description": "allowRevocationOfOtherTokens",
"required": false,
"type": "boolean"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/DataAccessToken"
}
}
}
},
"delete": {
"tags": [
"Data Access Tokens"
],
"summary": "revokeAllDataAccessTokens",
"operationId": "revokeAllDataAccessTokensUsingDELETE",
"produces": [
"*/*"
],
"responses": {
"200": {
"description": "OK"
}
}
}
},
"/data-access-tokens/{token}": {
"get": {
"tags": [
"Data Access Tokens"
],
"summary": "getDataAccessToken",
"operationId": "getDataAccessTokenUsingGET",
"produces": [
"*/*"
],
"parameters": [
{
"name": "token",
"in": "path",
"description": "token",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/DataAccessToken"
}
}
}
},
"delete": {
"tags": [
"Data Access Tokens"
],
"summary": "revokeDataAccessToken",
"operationId": "revokeDataAccessTokenUsingDELETE",
"produces": [
"*/*"
],
"parameters": [
{
"name": "token",
"in": "path",
"description": "token",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "OK"
}
}
}
},
"/filtered-samples/fetch": {
"post": {
"tags": [
Expand Down Expand Up @@ -1880,6 +2005,26 @@
},
"title": "CountSummary"
},
"DataAccessToken": {
"type": "object",
"properties": {
"creation": {
"type": "string",
"format": "date-time"
},
"expiration": {
"type": "string",
"format": "date-time"
},
"token": {
"type": "string"
},
"username": {
"type": "string"
}
},
"title": "DataAccessToken"
},
"DataBin": {
"type": "object",
"properties": {
Expand Down
Loading

0 comments on commit 879d87f

Please sign in to comment.