HDPDGI-45: Merged HDPDGI-45 to master and fixed conflicts

dashboard/v2/gruntfile.js

@@ -13,8 +13,8 @@ module.exports = function(grunt) {
                 livereload: 35729
             },
             js: {
-                files: ['public/**/*.js', '!public/lib/**', '!public/dist/**'],
-                tasks: ['shell','copy:mainjs']
+                files: ['public/**/*.js', '!public/lib/**', '!public/dist/**', '!public/js/app.min.js'],
+                tasks: ['shell', 'copy:mainjs']
             },
             html: {
                 files: ['public/**/*.html'],
@@ -31,14 +31,14 @@ module.exports = function(grunt) {
         },
         jshint: {
             all: {
-                src: ['gruntfile.js', 'package.json', 'server.js', 'server/**/*.js', 'public/**/*.js', '!public/lib/**', '!public/dist/**'],
+                src: ['gruntfile.js', 'package.json', 'server.js', 'server/**/*.js', 'public/**/*.js', '!public/lib/**', '!public/dist/**', '!public/**/app.min.js'],
                 options: {
                     jshintrc: true
                 }
             }
         },
         concurrent: {
-            tasks: ['watch','proxitserver'],
+            tasks: ['watch', 'proxitserver'],
             options: {
                 logConcurrentOutput: true
             }
@@ -115,16 +115,16 @@ module.exports = function(grunt) {
                 src: '**',
                 dest: 'dist',
             },
-        	 mainjs:{
+            mainjs: {
                 expand: true,
                 cwd: 'public/',
                 src: 'js/app.min.js',
                 dest: 'dist/js/',
                 flatten: true,
-     		    filter :'isFile'
+                filter: 'isFile'
             }
         },
-        clean: ['dist'],
+        clean: ['public/lib', 'dist'],
         proxit: {
             dev: {
                 options: {
@@ -134,10 +134,9 @@ module.exports = function(grunt) {
                         'hostnames': ['*'],
                         'routes': {
                             '/': 'dist',
-                            '/api':'http://162.249.6.39:21000/api'
+                            '/api': 'http://162.249.6.39:21000/api'
                         }
-                    }
-                   ]
+                    }]
                 }
             }
         }
@@ -146,8 +145,8 @@ module.exports = function(grunt) {
     require('load-grunt-tasks')(grunt);
     grunt.registerTask('default', ['devUpdate', 'bower', 'jshint', 'jsbeautifier:default']);
 
-    grunt.registerTask('server', ['jshint','build','concurrent']);
-    grunt.registerTask('build', ['clean','bower','copy:dist','minify','copy:mainjs']);
+    grunt.registerTask('server', ['jshint', 'build', 'concurrent']);
+    grunt.registerTask('build', ['clean', 'bower', 'copy:dist', 'minify', 'copy:mainjs']);
 
     grunt.registerTask('minify', 'Minify the all js', function() {
         var done = this.async();

dashboard/v2/public/index.html

@@ -45,7 +45,7 @@
 </header>
 <div class="content">
     <div data-ng-include="'/modules/notification/views/notifications.html'"></div>
-    <div data-ui-view></div>
+    <div data-ui-view class="container"></div>
 </div>
 <footer class="footer navbar-bottom">
     <div class="container">
@@ -65,7 +65,6 @@
 <script src="lib/angular-ui-utils/ui-utils.js"></script>
 <script src="lib/lodash/lodash.js"></script>
 <script src="http://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"></script>
-<script src="http://cpettitt.github.io/project/dagre-d3/latest/dagre-d3.js"></script>
 
 <script src="js/app.min.js"></script>
 </body>

dashboard/v2/public/js/app.js

@@ -57,9 +57,11 @@ angular.module('dgc').factory('lodash', ['$window',
             NotificationService.error(err);
         });
     } else {
+        if (errors) {
             errors.timeout = false;
             NotificationService.error(errors);
         }
+    }
     $rootScope.$on('$stateChangeStart', function() {
         d3.selectAll('.d3-tip').remove();
     });

dashboard/v2/public/modules/search/searchController.js

@@ -67,7 +67,7 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
                 $scope.$watch('currentPage + itemsPerPage', function() {
                     var begin = (($scope.currentPage - 1) * $scope.itemsPerPage),
                         end = begin + $scope.itemsPerPage;
-                    if ($scope.transformedResults)$scope.filteredResults = $scope.transformedResults.slice(begin, end);
+                    if ($scope.transformedResults) $scope.filteredResults = $scope.transformedResults.slice(begin, end);
                     $scope.pageCount = function() {
                         return Math.ceil($scope.resultCount / $scope.itemsPerPage);
                     };