Repository: incubator-atlas Updated Branches: refs/heads/apache-local [created] 869e6cf81
API Changes API changes Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/b1099dff Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/b1099dff Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/b1099dff Branch: refs/heads/apache-local Commit: b1099dffe3998a59078b0b7758deb8f902f0101d Parents: ee3af4a Author: DarshanKumar <[email protected]> Authored: Fri Jun 12 08:54:21 2015 +0530 Committer: DarshanKumar <[email protected]> Committed: Fri Jun 12 08:54:21 2015 +0530 ---------------------------------------------------------------------- dashboard/v2/gruntfile.js | 2 +- .../public/modules/details/detailsResource.js | 20 +------------------- .../public/modules/lineage/lineageController.js | 4 ++-- .../public/modules/lineage/lineageResource.js | 2 +- .../modules/navigation/navigationResource.js | 2 +- .../public/modules/search/searchController.js | 2 +- .../v2/public/modules/search/searchResource.js | 2 +- dashboard/v2/server.js | 1 + 8 files changed, 9 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b1099dff/dashboard/v2/gruntfile.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/gruntfile.js b/dashboard/v2/gruntfile.js index 3213ef6..2c2fb21 100755 --- a/dashboard/v2/gruntfile.js +++ b/dashboard/v2/gruntfile.js @@ -152,7 +152,7 @@ module.exports = function(grunt) { 'hostnames': ['*'], 'routes': { '/': 'dist', - '/api': 'http://162.249.6.39:21000/api' + '/api': 'http://162.249.6.50:21000/api' } }] } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b1099dff/dashboard/v2/public/modules/details/detailsResource.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/details/detailsResource.js b/dashboard/v2/public/modules/details/detailsResource.js index db621e7..af2f249 100644 --- a/dashboard/v2/public/modules/details/detailsResource.js +++ b/dashboard/v2/public/modules/details/detailsResource.js @@ -19,7 +19,7 @@ 'use strict'; angular.module('dgc.details').factory('DetailsResource', ['$resource', function($resource) { - return $resource('/api/metadata/entities/:id', {}, { + return $resource('/api/atlas/entities/:id', {}, { get: { method: 'GET', transformResponse: function(data) { @@ -31,22 +31,4 @@ angular.module('dgc.details').factory('DetailsResource', ['$resource', function( } }); - //$scope.getSchema= function (tableName) { - // - // $http.get('/api/metadata/lineage/hive/table/'+tableName +'/schema') - // .success(function (data) { - // $scope.iserror1=false; - // $scope.schema= angular.fromJson(data.results.rows); - // // console.log(tableName); - // - // - // }) - // .error(function () { - // // alert("Sorry No response"); - // - // - // - // }); - //} - }]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b1099dff/dashboard/v2/public/modules/lineage/lineageController.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/lineage/lineageController.js b/dashboard/v2/public/modules/lineage/lineageController.js index 23a2267..daecccb 100755 --- a/dashboard/v2/public/modules/lineage/lineageController.js +++ b/dashboard/v2/public/modules/lineage/lineageController.js @@ -110,9 +110,9 @@ angular.module('dgc.lineage').controller('LineageController', ['$element', '$sco var margin = { top: 100, - right: 70, + right: 80, bottom: 30, - left: 70 + left: 80 }; width = width - margin.right - margin.left; height = height - margin.top - margin.bottom; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b1099dff/dashboard/v2/public/modules/lineage/lineageResource.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/lineage/lineageResource.js b/dashboard/v2/public/modules/lineage/lineageResource.js index a690427..e729a35 100755 --- a/dashboard/v2/public/modules/lineage/lineageResource.js +++ b/dashboard/v2/public/modules/lineage/lineageResource.js @@ -19,5 +19,5 @@ 'use strict'; angular.module('dgc.lineage').factory('LineageResource', ['$resource', function($resource) { - return $resource('/api/metadata/lineage/hive/table/:tableName/:type/graph', {}); + return $resource('/api/atlas/lineage/hive/table/:tableName/:type/graph', {}); }]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b1099dff/dashboard/v2/public/modules/navigation/navigationResource.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/navigation/navigationResource.js b/dashboard/v2/public/modules/navigation/navigationResource.js index 50f5c26..67f510f 100644 --- a/dashboard/v2/public/modules/navigation/navigationResource.js +++ b/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/metadata/types?type=TRAIT', {}, { + return $resource('api/atlas/types?type=TRAIT', {}, { get: { 'method': 'GET', 'responseType': 'json', http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b1099dff/dashboard/v2/public/modules/search/searchController.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/searchController.js b/dashboard/v2/public/modules/search/searchController.js index 32a5573..b5e6c37 100755 --- a/dashboard/v2/public/modules/search/searchController.js +++ b/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); }; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b1099dff/dashboard/v2/public/modules/search/searchResource.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/searchResource.js b/dashboard/v2/public/modules/search/searchResource.js index 736ae86..19de021 100755 --- a/dashboard/v2/public/modules/search/searchResource.js +++ b/dashboard/v2/public/modules/search/searchResource.js @@ -19,7 +19,7 @@ 'use strict'; angular.module('dgc.search').factory('SearchResource', ['$resource', function($resource) { - return $resource('/api/metadata/discovery/search/', {}, { + return $resource('/api/atlas/discovery/search/', {}, { search: { 'method': 'GET', 'responseType': 'json', http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b1099dff/dashboard/v2/server.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/server.js b/dashboard/v2/server.js index 840026e..ebfb11c 100755 --- a/dashboard/v2/server.js +++ b/dashboard/v2/server.js @@ -1,4 +1,5 @@ #!/usr/bin/env node + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file
