Updated yeoman generator to support external ng-xos-lib
Updateding Custom Views:
- ceilometerDashboard
- contentProvider
- dashboardManager
- developer
- diagnostic
- hpc
- mCordTopology
- openVPN
- serviceGrid
- subscribers
- syncNotifier
- tenant
- truckroll
Change-Id: I8bdebf70d3b72ceca8ec04565213efa60bc0b8d3
diff --git a/views/ngXosViews/tenant/bower.json b/views/ngXosViews/tenant/bower.json
index c37483b..4c5c1a7 100644
--- a/views/ngXosViews/tenant/bower.json
+++ b/views/ngXosViews/tenant/bower.json
@@ -2,10 +2,10 @@
"name": "xos-tenant",
"version": "0.0.0",
"authors": [
- " <>"
+ "Arpit Agarwal <arpit@onlab.us>"
],
"description": "The tenant view",
- "license": "MIT",
+ "license": "Apache-2.0",
"ignore": [
"**/.*",
"node_modules",
@@ -14,7 +14,8 @@
"test",
"tests"
],
- "dependencies": {},
+ "dependencies": {
+ },
"devDependencies": {
"jquery": "2.1.4",
"angular-mocks": "1.4.7",
@@ -27,6 +28,7 @@
"bootstrap-css": "3.3.6",
"angular-chart.js": "~0.10.2",
"d3": "~3.5.17",
- "angular-recursion": "^1.0.5"
+ "angular-recursion": "~1.0.5",
+ "ng-xos-lib": "opencord/ng-xos-lib#~1.0.0"
}
}
diff --git a/views/ngXosViews/tenant/gulp/build.js b/views/ngXosViews/tenant/gulp/build.js
index b540fcc..2d2ec6b 100644
--- a/views/ngXosViews/tenant/gulp/build.js
+++ b/views/ngXosViews/tenant/gulp/build.js
@@ -42,7 +42,8 @@
[
options.dashboards + 'xosTenant.html',
options.static + 'css/xosTenant.css',
- options.static + 'images/*'
+ options.static + 'images/tenant-icon.png',
+ options.static + 'images/tenant-icon-active.png'
],
{force: true}
);
@@ -71,9 +72,9 @@
.pipe(gulp.dest(options.static + 'css/'))
});
- // copy images in correct folder
+ // copy images in correct folder
gulp.task('copyImages', ['wait'], function(){
- return gulp.src([`${options.icon}/*.png`])
+ return gulp.src([`${options.icon}/tenant-icon.png`,`${options.icon}/tenant-icon-active.png`])
.pipe(gulp.dest(options.static + 'images/'))
});
@@ -111,7 +112,7 @@
.pipe(
inject(
gulp.src([
- options.static + 'js/vendor/xosTenantVendor.js',
+ options.static + 'vendor/xosTenantVendor.js',
options.static + 'js/xosTenant.js',
options.static + 'css/xosTenant.css'
]),
@@ -137,7 +138,7 @@
return gulp.src(bowerDeps)
.pipe(concat('xosTenantVendor.js'))
.pipe(uglify())
- .pipe(gulp.dest(options.static + 'js/vendor/'));
+ .pipe(gulp.dest(options.static + 'vendor/'));
});
gulp.task('lint', function () {
diff --git a/views/ngXosViews/tenant/gulp/server.js b/views/ngXosViews/tenant/gulp/server.js
index 4d64442..f647ec7 100644
--- a/views/ngXosViews/tenant/gulp/server.js
+++ b/views/ngXosViews/tenant/gulp/server.js
@@ -52,15 +52,11 @@
server: {
baseDir: options.src,
routes: {
- '/xos/core/xoslib/static/js/vendor': options.helpers,
'/xos/core/static': options.static + '../../static/'
},
middleware: function(req, res, next){
if(
- // to be removed, deprecated API
- // req.url.indexOf('/xos/') !== -1 ||
- req.url.indexOf('/xoslib/tenant') !== -1 ||
- // req.url.indexOf('/hpcapi/') !== -1 ||
+ req.url.indexOf('/xoslib/tenant') !== -1 ||
req.url.indexOf('/api/') !== -1
){
if(conf.xoscsrftoken && conf.xossessionid){
@@ -119,7 +115,7 @@
inject(
gulp.src([
options.tmp + '**/*.js',
- options.helpers + 'ngXosHelpers.js'
+ options.helpers + 'ngXosHelpers.min.js'
])
.pipe(angularFilesort()),
{
diff --git a/views/ngXosViews/tenant/gulpfile.js b/views/ngXosViews/tenant/gulpfile.js
index 08df554..c825df8 100644
--- a/views/ngXosViews/tenant/gulpfile.js
+++ b/views/ngXosViews/tenant/gulpfile.js
@@ -6,12 +6,13 @@
var options = {
src: 'src/',
css: 'src/css/',
+ icon: 'src/icons',
sass: 'src/sass/',
scripts: 'src/js/',
tmp: 'src/.tmp',
dist: 'dist/',
api: '../../ngXosLib/api/',
- helpers: '../../../xos/core/xoslib/static/js/vendor/',
+ helpers: './src/vendor/ng-xos-lib/dist/',
static: '../../../xos/core/xoslib/static/', // this is the django static folder
dashboards: '../../../xos/core/xoslib/dashboards/' // this is the django html folder
};
diff --git a/views/ngXosViews/tenant/karma.conf.js b/views/ngXosViews/tenant/karma.conf.js
index 4123be9..e5abf39 100644
--- a/views/ngXosViews/tenant/karma.conf.js
+++ b/views/ngXosViews/tenant/karma.conf.js
@@ -26,8 +26,9 @@
// list of files / patterns to load in the browser
files: bowerComponents.concat([
- '../../../xos/core/xoslib/static/js/vendor/ngXosVendor.js',
- '../../../xos/core/xoslib/static/js/vendor/ngXosHelpers.js',
+ './src/vendor/ng-xos-lib/dist/ngXosVendor.min.js',
+ './src/vendor/ng-xos-lib/dist/ngXosHelpers.min.js',
+ 'src/js/main.js',
'src/js/**/*.js',
'spec/**/*.mock.js',
'spec/**/*.test.js',
@@ -45,6 +46,7 @@
preprocessors: {
'src/js/**/*.js': ['babel'],
'spec/**/*.test.js': ['babel'],
+ 'spec/**/*.mock.js': ['babel'],
'src/**/*.html': ['ng-html2js']
},
diff --git a/views/ngXosViews/tenant/package.json b/views/ngXosViews/tenant/package.json
index ed04285..d8da5f8 100644
--- a/views/ngXosViews/tenant/package.json
+++ b/views/ngXosViews/tenant/package.json
@@ -16,8 +16,8 @@
"Angular",
"XOSlib"
],
- "author": "",
- "license": "MIT",
+ "author": "Arpit Agarwal",
+ "license": "Apache-2.0",
"dependencies": {},
"devDependencies": {
"autoprefixer": "^6.3.3",
diff --git a/views/ngXosViews/tenant/src/css/dev.css b/views/ngXosViews/tenant/src/css/dev.css
new file mode 100644
index 0000000..0263242
--- /dev/null
+++ b/views/ngXosViews/tenant/src/css/dev.css
@@ -0,0 +1,5 @@
+#xosTenant{
+ position: absolute;
+ top: 100px;
+ left: 200px;
+}
\ No newline at end of file
diff --git a/views/ngXosViews/tenant/src/icons/README.md b/views/ngXosViews/tenant/src/icons/README.md
new file mode 100644
index 0000000..0d5a787
--- /dev/null
+++ b/views/ngXosViews/tenant/src/icons/README.md
@@ -0,0 +1,18 @@
+# Set icon for custom dashboard
+
+## Path to add images : <dashboard-name>/src/icons
+
+### Add two images with name in following format
+ <dashboard-name>-icon.png
+ <dashboard-name>-icon-active.png
+
+Examples:
+ If your dashboard name is `slice`
+ then you will add the images with the name as
+ `slice-icon.png`
+ `slice-icon-active.png`
+
+
+
+
+Note: If you don't add the custom images, then dashboard will use the default images stored at `/xos/core/xoslib/static/images`
\ No newline at end of file
diff --git a/views/ngXosViews/tenant/src/index.html b/views/ngXosViews/tenant/src/index.html
index d647aa5..d8ebd82 100644
--- a/views/ngXosViews/tenant/src/index.html
+++ b/views/ngXosViews/tenant/src/index.html
@@ -5,6 +5,7 @@
<!-- endbower -->
<!-- endcss -->
<!-- inject:css -->
+<link rel="stylesheet" href="/css/dev.css">
<link rel="stylesheet" href="/css/main.css">
<link rel="stylesheet" href="/../../../xos/core/static/xosNgLib.css">
<!-- endinject -->
@@ -31,7 +32,7 @@
<!-- endbower -->
<!-- endjs -->
<!-- inject:js -->
-<script src="/../../../xos/core/xoslib/static/js/vendor/ngXosHelpers.js"></script>
+<script src="/vendor/ng-xos-lib/dist/ngXosHelpers.min.js"></script>
<script src="/.tmp/main.js"></script>
<script src="/.tmp/sitedetail.js"></script>
<script src="/.tmp/createslice.js"></script>