Merge branch 'dal' of github.com:MPR-Global/metadata into apache-local

dashboard/v2/.gitignore

@@ -25,4 +25,4 @@ public/dist
 *.tgz
 node/
 dist/
-**/app.min.js
+**/app.min.js
\ No newline at end of file

dashboard/v2/README.md

@@ -28,6 +28,7 @@
 
 ```
 git clone $git-repo-url
+git checkout dal
 cd dashboard/v2
 npm install
 grunt server

dashboard/v2/bower.json

 {
-    "name": "dgc-metadata",
+    "name": "atlas-metadata",
     "description": "Apache Atlas",
     "version": "1.0.0-SNAPSHOT",
     "devDependencies": {

dashboard/v2/gruntfile.js

@@ -32,7 +32,7 @@ module.exports = function(grunt) {
             },
             js: {
                 files: ['public/**/*.js', '!public/lib/**', '!public/dist/**', '!public/js/app.min.js'],
-                tasks: ['shell', 'copy:mainjs']
+                tasks: ['shell']
             },
             html: {
                 files: ['public/**/*.html'],
@@ -86,7 +86,7 @@ module.exports = function(grunt) {
                 }
             }
         },
-        dist: 'public/js/app.min.js',
+        dist: 'dist/js/app.min.js',
         modules: grunt.file.expand(
             'public/js/app.js',
             'public/js/routes.js',
@@ -130,16 +130,8 @@ module.exports = function(grunt) {
             dist: {
                 expand: true,
                 cwd: 'public/',
-                src: '**',
-                dest: 'dist',
-            },
-            mainjs: {
-                expand: true,
-                cwd: 'public/',
-                src: 'js/app.min.js',
-                dest: 'dist/js/',
-                flatten: true,
-                filter: 'isFile'
+                src: ['**', '!js/**/*.js', '!modules/**/*.js'],
+                dest: 'dist'
             }
         },
         clean: ['public/lib', 'dist'],
@@ -164,7 +156,7 @@ module.exports = function(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('build', ['clean', 'bower', 'copy:dist', 'minify']);
 
     grunt.registerTask('minify', 'Minify the all js', function() {
         var done = this.async();

dashboard/v2/package.json

 {
-    "name": "Apache-Atlas",
+    "name": "atlas-metadata",
     "description": "Apache Atlas",
     "version": "0.5.0-incubating",
     "private": true,
-    "bin": "server.js",
     "repository": {
         "type": "git",
         "url": "https://git-wip-us.apache.org/repos/asf/incubator-atlas.git"
@@ -13,8 +12,9 @@
         "npm": "1.3.x"
     },
     "keywords": [
+        "Apache",
         "Atlas",
-        "DataGovernance"
+        "HortonWorks"
     ],
     "scripts": {
         "postinstall": "node node_modules/bower/bin/bower install"

dashboard/v2/public/js/app.js

@@ -38,15 +38,27 @@ angular.module('dgc').factory('lodash', ['$window',
     function($window) {
         return $window.d3;
     }
-]).factory('Global', ['$window',
-    function($window) {
+]).factory('Global', ['$window', '$location',
+    function($window, $location) {
         return {
-            user: $window.user,
+            user: $location.search()['user.name'],
             authenticated: !!$window.user,
             renderErrors: $window.renderErrors
         };
     }
-]).run(['$rootScope', 'Global', 'NotificationService', 'lodash', 'd3', function($rootScope, Global, NotificationService, lodash, d3) {
+]).factory('HttpInterceptor', ['Global', function(Global) {
+    return {
+        'request': function(config) {
+            if (config.url && (config.url.indexOf('api/atlas/') === 0 || config.url.indexOf('/api/atlas/') === 0)) {
+                config.params = config.params || {};
+                config.params['user.name'] = Global.user;
+            }
+            return config;
+        }
+    };
+}]).config(['$httpProvider', function($httpProvider) {
+    $httpProvider.interceptors.push('HttpInterceptor');
+}]).run(['$rootScope', 'Global', 'NotificationService', 'lodash', 'd3', function($rootScope, Global, NotificationService, lodash, d3) {
     var errors = Global.renderErrors;
     if (angular.isArray(errors) || angular.isObject(errors)) {
         lodash.forEach(errors, function(err) {

dashboard/v2/public/modules/home/views/home.html

@@ -17,5 +17,5 @@
   -->
 
 <section class="text-center">
-    <img data-ui-sref="search" data-ui-sref="search" class="pointer" src="modules/home/img/splash.png"/>
+    <img data-ui-sref="search" class="pointer" src="modules/home/img/splash.png"/>
 </section>
\ No newline at end of file

dashboard/v2/public/modules/lineage/lineageController.js

@@ -196,20 +196,20 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco
                     'translate(' + margin.left + ',' + margin.right + ')');
             //arrow
             svg.append("svg:defs").append("svg:marker").attr("id", "arrow").attr("viewBox", "0 0 10 10").attr("refX", 26).attr("refY", 5).attr("markerUnits", "strokeWidth").attr("markerWidth", 6).attr("markerHeight", 9).attr("orient", "auto").append("svg:path").attr("d", "M 0 0 L 10 5 L 0 10 z");
-            
+
             //marker for input type graph
             svg.append("svg:defs")
-            .append("svg:marker")
-            .attr("id", "input-arrow")
-            .attr("viewBox", "0 0 10 10")
-            .attr("refX", -15)
-            .attr("refY", 5)
-            .attr("markerUnits", "strokeWidth")
-            .attr("markerWidth", 6)
-            .attr("markerHeight", 9)
-            .attr("orient", "auto")
-            .append("svg:path")
-            .attr("d", "M -2 5 L 8 0 L 8 10 z");
+                .append("svg:marker")
+                .attr("id", "input-arrow")
+                .attr("viewBox", "0 0 10 10")
+                .attr("refX", -15)
+                .attr("refY", 5)
+                .attr("markerUnits", "strokeWidth")
+                .attr("markerWidth", 6)
+                .attr("markerHeight", 9)
+                .attr("orient", "auto")
+                .append("svg:path")
+                .attr("d", "M -2 5 L 8 0 L 8 10 z");
 
             var root = data;
 
@@ -284,10 +284,10 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco
                     .style('stroke', 'green')
                     .attr('d', diagonal);
 
-                if($scope.type === 'inputs') {
-                    link.attr("marker-start", "url(#input-arrow)");//if input
+                if ($scope.type === 'inputs') {
+                    link.attr("marker-start", "url(#input-arrow)"); //if input
                 } else {
-                    link.attr("marker-end", "url(#arrow)");//if input
+                    link.attr("marker-end", "url(#arrow)"); //if input
                 }
 
             }

dashboard/v2/public/modules/navigation/navigationResource.js

@@ -19,7 +19,7 @@
 'use strict';
 
 angular.module('dgc.navigation').factory('NavigationResource', ['$resource', function($resource) {
-    return $resource('api/atlas/types?type=TRAIT', {}, {
+    return $resource('/api/atlas/types?type=TRAIT', {}, {
         get: {
             'method': 'GET',
             'responseType': 'json',

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

@@ -21,7 +21,6 @@
 //Setting up route
 angular.module('dgc.search').config(['$stateProvider',
     function($stateProvider) {
-        // states for my app
         $stateProvider.state('search', {
             url: '/search?query',
             templateUrl: '/modules/search/views/search.html',

dashboard/v2/server.js

-#!/usr/bin/env node
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-/**
- * Module dependencies.
- */
-var express = require('express');
-
-/**
- * Main application entry file.
- * Please note that the order of loading is important.
- */
-
-// Initializing system variables
-var config = require('./server/config/config'),
-    app = express();
-
-// Express settings
-require('./server/config/express')(app);
-
-// Start the app by listening on <port>
-var port = process.env.PORT || config.port;
-app.listen(port);
-
-console.log('Environment is = "' + config.nodeEnv + '"');
-console.log('Express app started on port ' + port + ' using config\n', JSON.stringify(config, null, 4));
-
-// Expose app
-module.exports = app;