Compare commits

...

3 Commits

Author SHA1 Message Date
kzantow 8513344335 Add victory charts 2016-07-20 10:01:09 -07:00
kzantow 99a8618bc8 Merge branch 'victory-failure' into victory-charts-in-web 2016-07-20 09:41:31 -07:00
kzantow c9c014a573 Add victory chart to show error 2016-07-19 17:08:25 -07:00
7 changed files with 21 additions and 31 deletions

View File

@ -36,7 +36,7 @@
},
"dependencies": {
"@jenkins-cd/design-language": "0.0.63",
"@jenkins-cd/js-extensions": "0.0.19",
"@jenkins-cd/js-extensions": "0.0.20-beta-1",
"@jenkins-cd/js-modules": "0.0.5",
"@jenkins-cd/sse-gateway": "0.0.6",
"immutable": "3.8.1",
@ -52,7 +52,8 @@
"redux": "3.5.2",
"redux-thunk": "2.0.1",
"reselect": "2.5.1",
"window-handle": "1.0.0"
"window-handle": "1.0.0",
"victory": "0.9.0"
},
"jenkinscd": {
"extDependencies": [

View File

@ -0,0 +1,8 @@
import React from 'react';
import { VictoryChart } from 'victory';
export default class MyChart extends React.Component {
render() {
return <VictoryChart />;
}
}

View File

@ -1,6 +1,7 @@
import { Route, Redirect, IndexRoute, IndexRedirect } from 'react-router';
import React from 'react';
import Dashboard from './Dashboard';
import MyChart from './MyChart';
import OrganizationPipelines from './OrganizationPipelines';
import {
Pipelines,
@ -17,31 +18,6 @@ import {
export default (
<Route path="/" component={Dashboard}>
<Route path="organizations/:organization" component={OrganizationPipelines}>
<IndexRedirect to="pipelines" />
<Route path="pipelines" component={Pipelines} />
<Route component={PipelinePage}>
<Route path=":pipeline/branches" component={MultiBranch} />
<Route path=":pipeline/activity" component={Activity} />
<Route path=":pipeline/pr" component={PullRequests} />
<Route path=":pipeline/detail/:branch/:runId" component={RunDetails}>
<IndexRedirect to="pipeline" />
<Route path="pipeline" component={RunDetailsPipeline} >
<Route path=":node" component={RunDetailsPipeline} />
</Route>
<Route path="changes" component={RunDetailsChanges} />
<Route path="tests" component={RunDetailsTests} />
<Route path="artifacts" component={RunDetailsArtifacts} />
</Route>
<Redirect from=":pipeline(/*)" to=":pipeline/activity" />
</Route>
</Route>
<Route path="/pipelines" component={OrganizationPipelines}>
<IndexRoute component={Pipelines} />
</Route>
<IndexRedirect to="pipelines" />
<Route path="chart" component={MyChart}/>
</Route>
);

View File

@ -26,7 +26,7 @@
},
"dependencies": {
"@jenkins-cd/design-language": "0.0.63",
"@jenkins-cd/js-extensions": "0.0.19",
"@jenkins-cd/js-extensions": "0.0.20-beta-1",
"@jenkins-cd/js-modules": "0.0.5",
"history": "2.0.2",
"immutable": "3.8.1",
@ -39,7 +39,8 @@
"react-router": "2.3.0",
"redux": "3.5.2",
"redux-thunk": "2.0.1",
"window-handle": "1.0.0"
"window-handle": "1.0.0",
"victory": "0.9.0"
},
"jenkinscd": {
"extDependencies": [

View File

@ -54,6 +54,9 @@ exports.initialize = function (oncomplete) {
jenkinsMods.export('react', 'react', react);
jenkinsMods.export('react', 'react-dom', reactDOM);
const victory = require('victory');
jenkinsMods.export('victory', 'victory', victory);
// Get the extension list metadata from Jenkins.
// Might want to do some flux fancy-pants stuff for this.
const appRoot = document.getElementsByTagName("head")[0].getAttribute("data-appurl");

View File

@ -146,6 +146,7 @@ function createBundle(jsxFile) {
.withExternalModuleMapping('@jenkins-cd/design-language', 'jenkins-cd:jdl')
.withExternalModuleMapping('react', 'react:react')
.withExternalModuleMapping('react-dom', 'react:react-dom')
.withExternalModuleMapping('victory', 'victory:victory')
.inDir('target/classes/org/jenkins/ui/jsmodules/' + maven.getArtifactId());
}

View File

@ -1,6 +1,6 @@
{
"name": "@jenkins-cd/js-extensions",
"version": "0.0.19",
"version": "0.0.20-beta-1",
"description": "Jenkins Extension Store",
"main": "index.js",
"files": [