Skip to content

Commit

Permalink
WIP: First initial metrics page.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtho11
mtho11 committed Feb 11, 2015
1 parent 0bf3cac commit 3b5c13b
Show file tree
Hide file tree
Showing 14 changed files with 1,537 additions and 142 deletions.
1 change: 1 addition & 0 deletions bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "hawkular-ui-components",
"description": "WIP:Hawt.io 2 plugins for the Hawkular Console.",
"version": "0.1.8",
"keywords": [
"hawtio-hawkular",
Expand Down
368 changes: 364 additions & 4 deletions dist/hawkular-metrics.js
View file

Large diffs are not rendered by default.

33 changes: 17 additions & 16 deletions package.json
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
"version": "0.1.1",
"private": true,
"devDependencies": {
"bower": "^1.3.12",
"event-stream": "^3.1.7",
"gulp": "^3.8.10",
"gulp-angular-templatecache": "^1.5.0",
"gulp-clean": "^0.3.1",
"gulp-concat": "^2.4.2",
"gulp-connect": "^2.2.0",
"gulp-load-plugins": "^0.8.0",
"gulp-notify": "^2.1.0",
"gulp-typescript": "^2.3.0",
"gulp-watch": "^3.0.0",
"through2": "^0.6.3",
"underscore.string": "^2.4.0",
"vinyl-map": "^1.0.1",
"which": "^1.0.8",
"wiredep": "^2.2.2"
"bower": "1.3.12",
"event-stream": "3.1.7",
"gulp": "3.8.10",
"gulp-angular-templatecache": "1.5.0",
"gulp-clean": "0.3.1",
"gulp-concat": "2.4.2",
"gulp-connect": "2.2.0",
"gulp-load-plugins": "0.8.0",
"gulp-notify": "2.1.0",
"gulp-size": "1.2.0",
"gulp-typescript": "2.4.2",
"gulp-watch": "3.0.0",
"through2": "0.6.3",
"underscore.string": "2.4.0",
"vinyl-map": "1.0.1",
"which": "1.0.8",
"wiredep": "2.2.2"
}
}
8 changes: 7 additions & 1 deletion plugins/metrics/bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@
"dependencies": {
"hawtio-core": "2.0.9",
"hawtio-core-navigation": "2.0.17",
"hawtio-utilities": "2.0.16"
"hawtio-utilities": "2.0.16",
"moment": "2.9.0",
"angular-bootstrap": "0.11.0",
"toastr": "2.0.3",
"lodash": "2.4.1",
"ngstorage": "0.3.0",
"rhqm-charts": "0.1.10"
},
"devDependencies": {
"bootstrap": "3.3.2",
Expand Down
6 changes: 0 additions & 6 deletions plugins/metrics/defs.d.ts
View file

This file was deleted.

198 changes: 105 additions & 93 deletions plugins/metrics/gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,135 +22,147 @@ var gulp = require('gulp'),
map = require('vinyl-map'),
fs = require('fs'),
path = require('path'),
size = require('gulp-size'),
s = require('underscore.string'),
tslint = require('gulp-tslint');

var plugins = gulpLoadPlugins({});
var pkg = require('./package.json');
var normalSizeOptions = {
showFiles: true
}, gZippedSizeOptions = {
showFiles: true,
gzip: true
};


var config = {
main: '.',
ts: ['plugins/**/*.ts'],
templates: ['plugins/**/*.html'],
templateModule: pkg.name + '-templates',
dist: './dist/',
rootDist: '../../dist/',
js: pkg.name + '.js',
tsProject: plugins.typescript.createProject({
target: 'ES5',
module: 'commonjs',
declarationFiles: true,
noExternalResolve: false
})
main: '.',
ts: ['plugins/**/*.ts'],
templates: ['plugins/**/*.html'],
templateModule: pkg.name + '-templates',
dist: './dist/',
rootDist: '../../dist/',
js: pkg.name + '.js',
tsProject: plugins.typescript.createProject({
target: 'ES5',
module: 'commonjs',
declarationFiles: true,
noExternalResolve: false
})
};

gulp.task('bower', function() {
gulp.src('index.html')
.pipe(wiredep({}))
.pipe(gulp.dest('.'));
gulp.task('bower', function () {
gulp.src('index.html')
.pipe(wiredep({}))
.pipe(gulp.dest('.'));
});

/** Adjust the reference path of any typescript-built plugin this project depends on */
gulp.task('path-adjust', function() {
gulp.src('libs/**/includes.d.ts')
.pipe(map(function(buf, filename) {
var textContent = buf.toString();
var newTextContent = textContent.replace(/"\.\.\/libs/gm, '"../../../libs');
// console.log("Filename: ", filename, " old: ", textContent, " new:", newTextContent);
return newTextContent;
}))
.pipe(gulp.dest('libs'));
gulp.task('path-adjust', function () {
gulp.src('libs/**/includes.d.ts')
.pipe(map(function (buf, filename) {
var textContent = buf.toString();
var newTextContent = textContent.replace(/"\.\.\/libs/gm, '"../../../libs');
// console.log("Filename: ", filename, " old: ", textContent, " new:", newTextContent);
return newTextContent;
}))
.pipe(gulp.dest('libs'));
});

gulp.task('clean-defs', function() {
return gulp.src('defs.d.ts', { read: false })
.pipe(plugins.clean());
gulp.task('clean-defs', function () {
return gulp.src('defs.d.ts', {read: false})
.pipe(plugins.clean());
});

gulp.task('tsc', ['clean-defs'], function() {
var cwd = process.cwd();
var tsResult = gulp.src(config.ts)
.pipe(plugins.typescript(config.tsProject))
.on('error', plugins.notify.onError({
message: '#{ error.message }',
title: 'Typescript compilation error'
}));
gulp.task('tsc', ['clean-defs'], function () {
var cwd = process.cwd();
var tsResult = gulp.src(config.ts)
.pipe(plugins.typescript(config.tsProject))
.on('error', plugins.notify.onError({
message: '#{ error.message }',
title: 'Typescript compilation error'
}));

return eventStream.merge(
tsResult.js
.pipe(plugins.concat('compiled.js'))
.pipe(gulp.dest('.')),
tsResult.dts
.pipe(gulp.dest('d.ts')))
.pipe(map(function(buf, filename) {
if (!s.endsWith(filename, 'd.ts')) {
tsResult.js
.pipe(plugins.concat('compiled.js'))
.pipe(gulp.dest('.')),
tsResult.dts
.pipe(gulp.dest('d.ts')))
.pipe(map(function (buf, filename) {
if (!s.endsWith(filename, 'd.ts')) {
return buf;
}
var relative = path.relative(cwd, filename);
fs.appendFileSync('defs.d.ts', '/// <reference path="' + relative + '"/>\n');
return buf;
}
var relative = path.relative(cwd, filename);
fs.appendFileSync('defs.d.ts', '/// <reference path="' + relative + '"/>\n');
return buf;
}));
});

gulp.task('tslint', function(){
gulp.src(config.ts)
.pipe(tslint())
.pipe(tslint.report('verbose'));
gulp.task('tslint', function () {
gulp.src(config.ts)
.pipe(tslint())
.pipe(tslint.report('verbose'));
});

gulp.task('tslint-watch', function(){
gulp.src(config.ts)
.pipe(tslint())
.pipe(tslint.report('prose', {
emitError: false
}));
gulp.task('tslint-watch', function () {
gulp.src(config.ts)
.pipe(tslint())
.pipe(tslint.report('prose', {
emitError: false
}));
});

gulp.task('template', ['tsc'], function() {
return gulp.src(config.templates)
.pipe(plugins.angularTemplatecache({
filename: 'templates.js',
root: 'plugins/',
standalone: true,
module: config.templateModule,
templateFooter: '}]); hawtioPluginLoader.addModule("' + config.templateModule + '");'
}))
.pipe(gulp.dest('.'));
gulp.task('template', ['tsc'], function () {
return gulp.src(config.templates)
.pipe(plugins.angularTemplatecache({
filename: 'templates.js',
root: 'plugins/',
standalone: true,
module: config.templateModule,
templateFooter: '}]); hawtioPluginLoader.addModule("' + config.templateModule + '");'
}))
.pipe(gulp.dest('.'));
});

gulp.task('concat', ['template'], function() {
return gulp.src(['compiled.js', 'templates.js'])
.pipe(plugins.concat(config.js))
.pipe(gulp.dest(config.dist))
.pipe(gulp.dest(config.rootDist));
gulp.task('concat', ['template'], function () {
var gZipSize = size(gZippedSizeOptions);
return gulp.src(['compiled.js', 'templates.js'])
.pipe(plugins.concat(config.js))
.pipe(size(normalSizeOptions))
.pipe(gZipSize)
.pipe(gulp.dest(config.dist))
.pipe(gulp.dest(config.rootDist));

});

gulp.task('clean', ['concat'], function() {
return gulp.src(['templates.js', 'compiled.js'], { read: false })
.pipe(plugins.clean());
gulp.task('clean', ['concat'], function () {
return gulp.src(['templates.js', 'compiled.js'], {read: false})
.pipe(plugins.clean());
});

gulp.task('watch', ['build'], function() {
plugins.watch(['libs/**/*.js', 'libs/**/*.css', 'index.html', config.dist + '/' + config.js], function() {
gulp.start('reload');
});
plugins.watch(['libs/**/*.d.ts', config.ts, config.templates], function() {
gulp.start(['tslint-watch', 'tsc', 'template', 'concat', 'clean']);
});
gulp.task('watch', ['build'], function () {
plugins.watch(['libs/**/*.js', 'libs/**/*.css', 'index.html', config.dist + '/' + config.js], function () {
gulp.start('reload');
});
plugins.watch(['libs/**/*.d.ts', config.ts, config.templates], function () {
gulp.start(['tslint-watch', 'tsc', 'template', 'concat', 'clean']);
});
});

gulp.task('connect', ['watch'], function() {
plugins.connect.server({
root: '.',
livereload: true,
port: 2772,
fallback: 'index.html'
});
gulp.task('connect', ['watch'], function () {
plugins.connect.server({
root: '.',
livereload: true,
port: 2772,
fallback: 'index.html'
});
});

gulp.task('reload', function() {
gulp.src('.')
.pipe(plugins.connect.reload());
gulp.task('reload', function () {
gulp.src('.')
.pipe(plugins.connect.reload());
});

gulp.task('build', ['bower', 'path-adjust', 'tslint', 'tsc', 'template', 'concat', 'clean']);
Expand Down
9 changes: 9 additions & 0 deletions plugins/metrics/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<link rel="stylesheet" href="libs/patternfly/dist/css/patternfly.css" />

<!-- bower:css -->
<link rel="stylesheet" href="libs/toastr/toastr.css" />
<!-- endbower -->

<!-- ES6/ES6 shim -->
Expand Down Expand Up @@ -41,6 +42,14 @@
<script src="libs/hawtio-utilities/dist/sugar.js"></script>
<script src="libs/hawtio-utilities/dist/angular-file-upload.js"></script>
<script src="libs/hawtio-utilities/dist/hawtio-utilities.js"></script>
<script src="libs/moment/moment.js"></script>
<script src="libs/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="libs/toastr/toastr.js"></script>
<script src="libs/ngstorage/ngStorage.js"></script>
<script src="libs/d3/d3.js"></script>
<script src="libs/d3-tip/index.js"></script>
<script src="libs/numeral/numeral.js"></script>
<script src="libs/rhqm-charts/dist/rhqm-charts.js"></script>
<!-- endbower -->

<script src="libs/bootstrap/dist/js/bootstrap.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion plugins/metrics/package.json
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"gulp-connect": "2.2.0",
"gulp-load-plugins": "0.8.0",
"gulp-notify": "2.1.0",
"gulp-typescript": "2.4.2",
"gulp-tslint": "1.4.2",
"gulp-typescript": "2.4.2",
"gulp-watch": "3.0.0",
"through2": "0.6.3",
"underscore.string": "2.4.0",
Expand Down
2 changes: 2 additions & 0 deletions plugins/metrics/plugins/includes.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/// <reference path="../libs/hawtio-utilities/defs.d.ts"/>
/// <reference path="../libs/hawtio-core-dts/defs.d.ts"/>
/// <reference path="../vendor/moment/moment.d.ts"/>

/// Copyright 2014-2015 Red Hat, Inc. and/or its affiliates
/// and other contributors as indicated by the @author tags.
Expand Down
Loading

0 comments on commit 3b5c13b

Please sign in to comment.