http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/home/headerController.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/home/headerController.js b/dashboard/v2/public/modules/home/headerController.js deleted file mode 100755 index a8d1411..0000000 --- a/dashboard/v2/public/modules/home/headerController.js +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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'; - -angular.module('dgc.home').controller('HeaderController', ['$scope', function($scope) { - - $scope.menu = []; - - $scope.isCollapsed = true; - $scope.isLoggedIn = function() { - return true; - }; -}]);
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/home/homeModule.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/home/homeModule.js b/dashboard/v2/public/modules/home/homeModule.js deleted file mode 100755 index 017811c..0000000 --- a/dashboard/v2/public/modules/home/homeModule.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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'; - -angular.module('dgc.home', []); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/home/views/header.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/home/views/header.html b/dashboard/v2/public/modules/home/views/header.html deleted file mode 100755 index 85c5f4d..0000000 --- a/dashboard/v2/public/modules/home/views/header.html +++ /dev/null @@ -1,36 +0,0 @@ -<!-- - ~ 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. - --> - -<div data-ng-controller="HeaderController" class="row"> - <div class="navbar-header"> - <button class="navbar-toggle" type="button" data-ng-click="isCollapsed = !isCollapsed"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a data-ui-sref="search({ query: '' })" data-ui-sref-active="active"><img src="../img/ApacheAtlasLogo.png" /></a> - </div> - <nav class="collapse navbar-collapse" data-collapse="isCollapsed" data-role="navigation"> - <ul class="navbar-nav nav" data-ng-if="isLoggedIn()"> - <li data-ng-repeat="item in menu" data-ui-sref-active="active"> - <a data-ui-sref="{{item.state}}">{{item.title}}</a> - </li> - </ul> - </nav> -</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/home/views/home.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/home/views/home.html b/dashboard/v2/public/modules/home/views/home.html deleted file mode 100755 index 4e93782..0000000 --- a/dashboard/v2/public/modules/home/views/home.html +++ /dev/null @@ -1,21 +0,0 @@ -<!-- - ~ 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. - --> - -<section class="text-center"> - <img data-ui-sref="search" class="pointer" src="modules/home/img/splash.png"/> -</section> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/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 deleted file mode 100755 index b8bd09c..0000000 --- a/dashboard/v2/public/modules/lineage/lineageController.js +++ /dev/null @@ -1,299 +0,0 @@ -/* - * 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'; - -angular.module('dgc.lineage').controller('LineageController', ['$element', '$scope', '$state', '$stateParams', 'lodash', 'LineageResource', 'd3', 'DetailsResource', '$q', - function($element, $scope, $state, $stateParams, _, LineageResource, d3, DetailsResource, $q) { - var guidsList = []; - - function getLineageData(tableData, callRender) { - LineageResource.get({ - tableName: tableData.tableName, - type: tableData.type - }, function lineageSuccess(response) { - if (!_.isEmpty(response.results.values.vertices)) { - var allGuids = loadProcess(response.results.values.edges, response.results.values.vertices); - allGuids.then(function(res) { - guidsList = res; - $scope.lineageData = transformData(response.results); - if (callRender) { - render(); - } - }); - } - $scope.requested = false; - }); - } - - function loadProcess(edges, vertices) { - - var urlCalls = []; - var deferred = $q.defer(); - for (var guid in edges) { - if (!vertices.hasOwnProperty(guid)) { - urlCalls.push(DetailsResource.get({ - id: guid - }).$promise); - } - - } - $q.all(urlCalls) - .then(function(results) { - deferred.resolve(results); - }); - return deferred.promise; - } - - $scope.type = $element.parent().attr('data-table-type'); - $scope.requested = false; - - function render() { - renderGraph($scope.lineageData, { - element: $element[0], - height: $element[0].offsetHeight, - width: $element[0].offsetWidth - }); - $scope.rendered = true; - } - - $scope.$on('render-lineage', function(event, lineageData) { - if (lineageData.type === $scope.type) { - if (!$scope.lineageData) { - if (!$scope.requested) { - getLineageData(lineageData, true); - $scope.requested = true; - } - } else { - render(); - } - } - }); - - function transformData(metaData) { - var edges = metaData.values.edges, - vertices = metaData.values.vertices, - nodes = {}; - - function getNode(guid) { - var name, type, tip; - if (vertices.hasOwnProperty(guid)) { - name = vertices[guid].values.name; - type = vertices[guid].values.vertexId.values.typeName; - } else { - var loadProcess = getLoadProcessTypes(guid); - if (typeof loadProcess !== "undefined") { - name = loadProcess.name; - type = loadProcess.typeName; - tip = loadProcess.tip; - } else { - name = 'Load Process'; - type = 'Load Process'; - } - } - var vertex = { - guid: guid, - name: name, - type: type, - tip: tip - }; - if (!nodes.hasOwnProperty(guid)) { - nodes[guid] = vertex; - } - return nodes[guid]; - } - - function getLoadProcessTypes(guid) { - var procesRes = []; - angular.forEach(guidsList, function(value) { - if (value.id.id === guid) { - procesRes.name = value.values.name; - procesRes.typeName = value.typeName; - procesRes.tip = value.values.queryText; - } - }); - return procesRes; - } - - function attachParent(edge, node) { - edge.forEach(function eachPoint(childGuid) { - var childNode = getNode(childGuid); - node.children = node.children || []; - node.children.push(childNode); - childNode.parent = node.guid; - }); - } - - /* Loop through all edges and attach them to correct parent */ - for (var guid in edges) { - var edge = edges[guid], - node = getNode(guid); - - /* Attach parent to each endpoint of edge */ - attachParent(edge, node); - } - - /* Return the first node w/o parent, this is root node*/ - return _.find(nodes, function(node) { - return !node.hasOwnProperty('parent'); - }); - } - - function renderGraph(data, container) { - // ************** Generate the tree diagram ***************** - var element = d3.select(container.element), - width = Math.max(container.width, 960), - height = Math.max(container.height, 350); - - var margin = { - top: 100, - right: 80, - bottom: 30, - left: 80 - }; - width = width - margin.right - margin.left; - height = height - margin.top - margin.bottom; - - var i = 0; - - var tree = d3.layout.tree() - .size([height, width]); - - var diagonal = d3.svg.diagonal() - .projection(function(d) { - return [d.y, d.x]; - }); - - /* Initialize tooltip */ - var tooltip = d3.tip() - .attr('class', 'd3-tip') - .html(function(d) { - return '<pre class="alert alert-success">' + d.tip + '</pre>'; - }); - - var svg = element.select('svg') - .attr('width', width + margin.right + margin.left) - .attr('height', height + margin.top + margin.bottom) - /* Invoke the tip in the context of your visualization */ - .call(tooltip) - .select('g') - .attr('transform', - '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"); - - var root = data; - - function update(source) { - - // Compute the new tree layout. - var nodes = tree.nodes(source).reverse(), - links = tree.links(nodes); - - // Normalize for fixed-depth. - nodes.forEach(function(d) { - d.y = d.depth * 180; - }); - - // Declare the nodes⦠- var node = svg.selectAll('g.node') - .data(nodes, function(d) { - return d.id || (d.id = ++i); - }); - - // Enter the nodes. - var nodeEnter = node.enter().append('g') - .attr('class', 'node') - .attr('transform', function(d) { - return 'translate(' + d.y + ',' + d.x + ')'; - }); - - nodeEnter.append("image") - .attr("xlink:href", function(d) { - //return d.icon; - return d.type === 'Table' ? '../img/tableicon.png' : '../img/process.png'; - }) - .on('mouseover', function(d) { - if (d.type === 'LoadProcess') { - tooltip.show(d); - } - }) - .on('mouseout', function(d) { - if (d.type === 'LoadProcess') { - tooltip.hide(d); - } - }) - .attr("x", "-18px") - .attr("y", "-18px") - .attr("width", "34px") - .attr("height", "34px"); - - nodeEnter.append('text') - .attr('x', function(d) { - return d.children || d._children ? - (5) * -1 : +15; - }) - .attr('dy', '-1.75em') - .attr('text-anchor', function(d) { - return d.children || d._children ? 'middle' : 'middle'; - }) - .text(function(d) { - return d.name; - }) - - .style('fill-opacity', 1); - - // Declare the links⦠- var link = svg.selectAll('path.link') - .data(links, function(d) { - return d.target.id; - }); - - link.enter().insert('path', 'g') - .attr('class', 'link') - //.style('stroke', function(d) { return d.target.level; }) - .style('stroke', 'green') - .attr('d', diagonal); - - if ($scope.type === 'inputs') { - link.attr("marker-start", "url(#input-arrow)"); //if input - } else { - link.attr("marker-end", "url(#arrow)"); //if input - } - - } - - update(root); - } - - } -]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/lineage/lineageModule.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/lineage/lineageModule.js b/dashboard/v2/public/modules/lineage/lineageModule.js deleted file mode 100755 index 4fda24d..0000000 --- a/dashboard/v2/public/modules/lineage/lineageModule.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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'; - -angular.module('dgc.lineage', []); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/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 deleted file mode 100755 index e729a35..0000000 --- a/dashboard/v2/public/modules/lineage/lineageResource.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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'; - -angular.module('dgc.lineage').factory('LineageResource', ['$resource', function($resource) { - return $resource('/api/atlas/lineage/hive/table/:tableName/:type/graph', {}); -}]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/lineage/views/lineage.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/lineage/views/lineage.html b/dashboard/v2/public/modules/lineage/views/lineage.html deleted file mode 100755 index e2e9ebd..0000000 --- a/dashboard/v2/public/modules/lineage/views/lineage.html +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - ~ 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. - --> - -<div class="lineage-viz" data-ng-controller="LineageController"> - <h4 data-ng-if="!requested && !lineageData">No lineage data found</h4> - <i data-ng-if="requested" class="fa fa-spinner fa-spin fa-5x"></i> - <svg > - <g/> - </svg> -</div> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/navigation/navigationController.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/navigation/navigationController.js b/dashboard/v2/public/modules/navigation/navigationController.js deleted file mode 100644 index a012885..0000000 --- a/dashboard/v2/public/modules/navigation/navigationController.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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'; - -angular.module('dgc.navigation').controller('NavigationController', ['$scope', 'NavigationResource', - function($scope, NavigationResource) { - - $scope.leftnav = NavigationResource.get(); - $scope.updateVar = function(event) { - $scope.$$prevSibling.query = angular.element(event.target).text(); - - }; - - } -]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/navigation/navigationModule.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/navigation/navigationModule.js b/dashboard/v2/public/modules/navigation/navigationModule.js deleted file mode 100644 index 504eb1f..0000000 --- a/dashboard/v2/public/modules/navigation/navigationModule.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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'; - -angular.module('dgc.navigation', []); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/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 deleted file mode 100644 index 3d9797d..0000000 --- a/dashboard/v2/public/modules/navigation/navigationResource.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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'; - -angular.module('dgc.navigation').factory('NavigationResource', ['$resource', function($resource) { - return $resource('/api/atlas/types?type=TRAIT', {}, { - get: { - 'method': 'GET', - 'responseType': 'json', - 'isArray': true, - 'transformResponse': function(data) { - var results = []; - angular.forEach(data && data.results, function(val) { - results.push(val); - }); - return results; - } - } - }); -}]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/navigation/views/navigation.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/navigation/views/navigation.html b/dashboard/v2/public/modules/navigation/views/navigation.html deleted file mode 100644 index 1c94671..0000000 --- a/dashboard/v2/public/modules/navigation/views/navigation.html +++ /dev/null @@ -1,24 +0,0 @@ -<!-- - ~ 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. - --> - -<div data-ng-controller="NavigationController"> - <h4>Tags</h4> - <div class="list-group"> - <a ng-repeat="nav in leftnav" ui-sref="search({ query: nav })" class="list-group-item">{{nav}} </a> - </div> -</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/notification/notificationController.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/notification/notificationController.js b/dashboard/v2/public/modules/notification/notificationController.js deleted file mode 100755 index ac36b0f..0000000 --- a/dashboard/v2/public/modules/notification/notificationController.js +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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'; - -angular.module('dgc.system.notification').controller('NotificationController', ['$scope', 'NotificationService', - function($scope, NotificationService) { - - $scope.getNotifications = NotificationService.getAll; - - $scope.close = function(notification) { - NotificationService.close(notification); - }; - } -]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/notification/notificationModule.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/notification/notificationModule.js b/dashboard/v2/public/modules/notification/notificationModule.js deleted file mode 100755 index e99736f..0000000 --- a/dashboard/v2/public/modules/notification/notificationModule.js +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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'; - -angular.module('dgc.system.notification', ['ui.router']).constant('ColorCoding', { - info: 'success', - error: 'danger' -}).run(['$rootScope', 'NotificationService', function($rootScope, NotificationService) { - $rootScope.$on('$locationChangeSuccess', function(evt, from, to) { - if (from !== to) { - NotificationService.reset(); - } - }); -}]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/notification/notificationService.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/notification/notificationService.js b/dashboard/v2/public/modules/notification/notificationService.js deleted file mode 100755 index 613cc22..0000000 --- a/dashboard/v2/public/modules/notification/notificationService.js +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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'; - -angular.module('dgc.system.notification').service('NotificationService', ['$timeout', 'lodash', 'ColorCoding', function($timeout, _, colorCoding) { - - var notifications = [], - service = { - timeout: 2000, - getAll: function() { - return notifications; - }, - reset: function() { - notifications = []; - }, - close: function(notification) { - _.remove(notifications, notification); - } - }; - - _.each(colorCoding, function(value, key) { - service[key] = function(message, timeout) { - var notification = message; - if (_.isString(message)) { - notification = { - message: message - }; - } - - notification.message = notification.msg || notification.message; - delete notification.msg; - notification.type = value; - notification.timeout = _.isUndefined(timeout) ? (_.isUndefined(notification.timeout) ? true : notification.timeout) : timeout; - notifications.push(notification); - - if (notification.timeout) { - $timeout(function() { - service.close(notification); - }, angular.isNumber(notification.timeout) ? notification.timeout : service.timeout); - } - }; - }); - - return service; -}]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/notification/views/notifications.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/notification/views/notifications.html b/dashboard/v2/public/modules/notification/views/notifications.html deleted file mode 100755 index dcc02c5..0000000 --- a/dashboard/v2/public/modules/notification/views/notifications.html +++ /dev/null @@ -1,23 +0,0 @@ -<!-- - ~ 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. - --> - -<div class="container" data-ng-controller="NotificationController"> - <alert data-ng-repeat="notification in getNotifications()" data-type="{{notification.type}}" data-close="close(notification)"> - {{notification.message}} - </alert> -</div> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/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 deleted file mode 100755 index b5e6c37..0000000 --- a/dashboard/v2/public/modules/search/searchController.js +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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'; - -angular.module('dgc.search').controller('SearchController', ['$scope', '$location', '$http', '$state', '$stateParams', 'lodash', 'SearchResource', 'NotificationService', - function($scope, $location, $http, $state, $stateParams, _, SearchResource, NotificationService) { - - $scope.results = []; - $scope.resultCount = 0; - $scope.isCollapsed = true; - $scope.currentPage = 1; - $scope.itemsPerPage = 10; - $scope.filteredResults = []; - $scope.resultRows = []; - $scope.setPage = function(pageNo) { - $scope.currentPage = pageNo; - }; - $scope.search = function(query) { - $scope.results = []; - NotificationService.reset(); - $scope.limit = 4; - $scope.searchMessage = 'load-gif'; - - $scope.$parent.query = query; - SearchResource.search({ - query: query - }, function searchSuccess(response) { - $scope.resultCount = response.count; - $scope.results = response.results; - $scope.resultRows = $scope.results.rows; - $scope.totalItems = $scope.resultCount; - $scope.transformedResults = {}; - $scope.dataTransitioned = false; - if (response.results.dataType && response.results.dataType.typeName.indexOf('__') === 0) { - $scope.dataTransitioned = true; - var attrDef = response.results.dataType.attributeDefinitions; - angular.forEach(attrDef, function(value) { - if (value.dataTypeName === '__IdType') { - $scope.searchKey = value.name; - } - }); - $scope.transformedResults = $scope.filterResults(); - } else { - $scope.transformedResults = $scope.resultRows; - } - if ($scope.results.rows) - $scope.searchMessage = $scope.resultCount + ' results matching your search query ' + $scope.query + ' were found'; - else - $scope.searchMessage = '0 results matching your search query ' + $scope.query + ' were found'; - - $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); - $scope.pageCount = function() { - return Math.ceil($scope.resultCount / $scope.itemsPerPage); - }; - if ($scope.results.length < 1) { - NotificationService.error('No Result found', false); - } - }); - }, function searchError(err) { - $scope.searchMessage = '0 results matching your search query ' + $scope.query + ' were found'; - NotificationService.error('Error occurred during executing search query, error status code = ' + err.status + ', status text = ' + err.statusText, false); - }); - $state.go('search', { - query: query - }, { - location: 'replace' - }); - }; - - $scope.filterResults = function() { - var res = []; - angular.forEach($scope.resultRows, function(value) { - res.push(value[$scope.searchKey]); - }); - return res; - }; - $scope.doToggle = function($event, el) { - this.isCollapsed = !el; - }; - $scope.filterSearchResults = function(items) { - var res = {}; - var count = 0; - items = _.omit(items, ['name', 'description', 'guid']); - angular.forEach(items, function(value, key) { - if (typeof value !== 'object' && (key.indexOf('$$') < 0)) { - res[key] = value; - count++; - } - }); - $scope.keyLength = count; - return res; - }; - $scope.searchQuery = $location.search(); - $scope.query = ($location.search()).query; - if ($scope.query) { - - $scope.search($scope.query); - } - } -]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/searchDirective.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/searchDirective.js b/dashboard/v2/public/modules/search/searchDirective.js deleted file mode 100644 index 5c9fc48..0000000 --- a/dashboard/v2/public/modules/search/searchDirective.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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'; - -angular.module('dgc.search').directive( - "myDirective", - function() { - return { - restrict: 'EA', - template: '<a href="javascript: void(0);" button-toggle toggle="isCollapsed" class="show-more" ng-click="isCollapsed = !isCollapsed">..show more</a>', - link: function($scope) { - $scope.isCollapsed = true; - console.log($scope.isCollapsed); - }, - transclude: true, - scope: {} - }; - }); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/searchModule.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/searchModule.js b/dashboard/v2/public/modules/search/searchModule.js deleted file mode 100755 index ac82e3e..0000000 --- a/dashboard/v2/public/modules/search/searchModule.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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'; - -angular.module('dgc.search', ['dgc.details']); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/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 deleted file mode 100755 index 19de021..0000000 --- a/dashboard/v2/public/modules/search/searchResource.js +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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'; - -angular.module('dgc.search').factory('SearchResource', ['$resource', function($resource) { - return $resource('/api/atlas/discovery/search/', {}, { - search: { - 'method': 'GET', - 'responseType': 'json', - 'transformResponse': function(data) { - return data; - } - } - }); - -}]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/searchRoutes.js ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/searchRoutes.js b/dashboard/v2/public/modules/search/searchRoutes.js deleted file mode 100755 index abfe322..0000000 --- a/dashboard/v2/public/modules/search/searchRoutes.js +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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'; - -//Setting up route -angular.module('dgc.search').config(['$stateProvider', - function($stateProvider) { - $stateProvider.state('search', { - url: '/search?query', - templateUrl: '/modules/search/views/search.html', - controller: 'SearchController' - }); - } -]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/search.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/search.html b/dashboard/v2/public/modules/search/views/search.html deleted file mode 100755 index 389364d..0000000 --- a/dashboard/v2/public/modules/search/views/search.html +++ /dev/null @@ -1,67 +0,0 @@ -<!-- - ~ 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. - --> - -<div class="row mt20px"> - <form class="col-lg-offset-3 col-lg-9" name="form" novalidate> - <div class="input-group"> - <input type="text" class="form-control" placeholder="Search" data-ng-model="query" required/> - <span class="input-group-btn"> - <button class="btn btn-success" type="submit" data-ng-disabled="form.$invalid" ui-sref="search({ query: query })"> - <i class="glyphicon glyphicon-search white "></i> - </button> - </span> - </div> - <div> - <small class="small-txt">Search: Table, DB, Column</small> - </div> - </form> -</div> -<div class="row mt10px"> - <div class="col-lg-3" data-ng-include="'/modules/navigation/views/navigation.html'"></div> - <div class="col-lg-9"> - <div ng-switch on="searchMessage"> - <div ng-switch-when="load-gif" class="search-spinner"><img src="../img/spinner.gif" align="middle" /></div> - <div ng-switch-default><h4 ng-show="searchMessage">{{searchMessage}}</h4></div> - </div> - <ul class="list-unstyled" ng-show='resultCount > 0'> - <li ng-repeat="result in filteredResults" class="searchresults"> - <h4><a data-ui-sref="details({id:result['$id$'].id || result.guid})">{{result.name || result.guid}}</a></h4> - - <p>{{result.description}}</p> - <span ng-repeat="(key, value) in filterSearchResults(result)"> - <span ng-show="$index <= 3 "><b>{{key}}: </b>{{value}} {{(($index+1 === limit) || $last ) ? '' : ', '}}</span> - </span> - - <div collapse="isCollapsed"> - <span ng-repeat="(key, value) in filterSearchResults(result)"> - <span ng-show="$index > 3"><b>{{key}}: </b>{{value}}{{$last ? '' : ', '}}</span> - </span> - </div> - <a href ng-show="isCollapsed && (keyLength > 4)" ng-click="doToggle($event,isCollapsed)">..show more</a> - <a href ng-show="!isCollapsed" ng-click="doToggle($event,isCollapsed)">..show less</a> - - <h5 ng-show="!dataTransitioned">Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search({query: key})">{{key}}</a></h5> - - </li> - </ul> - <div class="pull-right" ng-show='resultCount > 0'> - <pagination total-items="totalItems" items-per-page="itemsPerPage" ng-model="currentPage" ng-change="pageChanged()"></pagination> - <p> - </div> - </div> -</div> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/searchResult.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/searchResult.html b/dashboard/v2/public/modules/search/views/searchResult.html deleted file mode 100755 index 0faf3bb..0000000 --- a/dashboard/v2/public/modules/search/views/searchResult.html +++ /dev/null @@ -1,47 +0,0 @@ -<!-- - ~ 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. - --> -<!-- -<h4 ng-show='results.rows.length > 0'>{{results.rows.length}} results matching your search query "{{query}}" were found</h4> -<h4 ng-show='results.rows.length == "0"'>searching .....</h4> -<h4 ng-show='!(results.rows)'>0 results matching your search query "{{query}}" were found</h4>--> - -<h4 ng-show="searchMessage">{{searchMessage}}</h4> - -<ul class="list-unstyled"> - <li ng-repeat="result in filteredResults" class="searchresults"> - <h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4> - <p>{{result.description}}</p> - <span ng-repeat="(key, value) in filterSearchResults(result)" > - <span ng-show="$index < 4"><b>{{key}}: </b>{{value}}{{$index+1 === limit ? '' : ', '}}</span> - </span> - <div collapse="isCollapsed"> - <span ng-repeat="(key, value) in filterSearchResults(result)" > - <span ng-show="$index > 4"><b>{{key}}: </b>{{value}}{{$last ? '' : ', '}}</span> - </span> - </div> - <a href ng-show="isCollapsed && (keyLength > 4)" ng-click="doToggle($event,isCollapsed)">..show more</a> - <a href ng-show="!isCollapsed" ng-click="doToggle($event,isCollapsed)">..show less</a> - - <h5>Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5> - <div data-ng-if="!searchTypesAvailable" data-ng-include="'/modules/search/views/types/guid.html'"></div> - </li> -</ul> -<div class="resultsPagination" ng-show='filteredResults.length > 0'> - <pagination total-items="totalItems" items-per-page="itemsPerPage" ng-model="currentPage" ng-change="pageChanged()"></pagination> - <p> -</div> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/types/column.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/types/column.html b/dashboard/v2/public/modules/search/views/types/column.html deleted file mode 100644 index 3bbb6c0..0000000 --- a/dashboard/v2/public/modules/search/views/types/column.html +++ /dev/null @@ -1,21 +0,0 @@ -<!-- - ~ 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. - --> - -<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4> -<p><b>Comment:</b> {{result.comment}}, <b>DataType:</b> {{result.dataType}},<b>Table:</b> {{result.table}}</p> -<h5>Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/types/db.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/types/db.html b/dashboard/v2/public/modules/search/views/types/db.html deleted file mode 100644 index 28467b0..0000000 --- a/dashboard/v2/public/modules/search/views/types/db.html +++ /dev/null @@ -1,22 +0,0 @@ -<!-- - ~ 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. - --> - -<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4> -<p>{{result.description}}</p> -<p><b>locationUri:</b> {{result.locationUri}}, <b>Owner: </b>{{result.owner}}</p> -<h5>Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/types/guid.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/types/guid.html b/dashboard/v2/public/modules/search/views/types/guid.html deleted file mode 100755 index 483ca80..0000000 --- a/dashboard/v2/public/modules/search/views/types/guid.html +++ /dev/null @@ -1,21 +0,0 @@ -<!-- - ~ 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. - --> - -<h4><a data-ui-sref="details({id:result.instanceInfo.guid})">{{result.instanceInfo.guid}}</a></h4> -<p><b>TypeName: </b>{{result.instanceInfo.typeName}}</p> -<h5>Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/types/hiveLineage.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/types/hiveLineage.html b/dashboard/v2/public/modules/search/views/types/hiveLineage.html deleted file mode 100755 index b150722..0000000 --- a/dashboard/v2/public/modules/search/views/types/hiveLineage.html +++ /dev/null @@ -1,19 +0,0 @@ -<!-- - ~ 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. - --> - -<a data-ui-sref="details({id:result.guid})">{{result.guid}}</a> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/types/hive_table.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/types/hive_table.html b/dashboard/v2/public/modules/search/views/types/hive_table.html deleted file mode 100755 index 84b747e..0000000 --- a/dashboard/v2/public/modules/search/views/types/hive_table.html +++ /dev/null @@ -1,19 +0,0 @@ -<!-- - ~ 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. - --> - -<a data-ui-sref="details({id:result.guid})">{{result["hive_table.name"]}}</a> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/types/loadprocess.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/types/loadprocess.html b/dashboard/v2/public/modules/search/views/types/loadprocess.html deleted file mode 100644 index 652cd97..0000000 --- a/dashboard/v2/public/modules/search/views/types/loadprocess.html +++ /dev/null @@ -1,22 +0,0 @@ -<!-- - ~ 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. - --> - -<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4> -<p>{{result.description}}</p> -<p><b>inputTables: </b>{{result.inputTables['id']}},<b>queryText: </b>{{result.queryText}},<b>startTime: </b>{{result.startTime | date:'medium'}},<b>endTime: </b> {{result.endTime | date:'medium'}}</p> -<h5>Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/types/storagedesc.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/types/storagedesc.html b/dashboard/v2/public/modules/search/views/types/storagedesc.html deleted file mode 100644 index 0587f26..0000000 --- a/dashboard/v2/public/modules/search/views/types/storagedesc.html +++ /dev/null @@ -1,21 +0,0 @@ -<!-- - ~ 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. - --> - -<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4> -<p><b>compressed: </b>{{result.compressed}},<b>outputFormat: </b>{{result.outputFormat}},<b>location: </b>{{result.location}}, <b>inputFormat: </b>{{result.inputFormat}}</p> -<h5>Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/dashboard/v2/public/modules/search/views/types/table.html ---------------------------------------------------------------------- diff --git a/dashboard/v2/public/modules/search/views/types/table.html b/dashboard/v2/public/modules/search/views/types/table.html deleted file mode 100644 index a678ff9..0000000 --- a/dashboard/v2/public/modules/search/views/types/table.html +++ /dev/null @@ -1,22 +0,0 @@ -<!-- - ~ 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. - --> - -<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4> -<p>{{result.description}}</p> -<p><b>owner: </b>{{result.owner}}, <b>createTime: </b>{{result.createTime}}</p> -<h5>Tags : <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/distro/src/main/assemblies/src-package.xml ---------------------------------------------------------------------- diff --git a/distro/src/main/assemblies/src-package.xml b/distro/src/main/assemblies/src-package.xml index ca03c7a..7df4c7a 100755 --- a/distro/src/main/assemblies/src-package.xml +++ b/distro/src/main/assemblies/src-package.xml @@ -36,11 +36,11 @@ <exclude>**/*.iml</exclude> <exclude>**/*.log</exclude> <exclude>**/*.pyc</exclude> <!-- python compiled executable --> - <exclude>dashboard/**/.bower-*/**</exclude> <!-- temp libs --> - <exclude>dashboard/v2/lib/**</exclude> <!-- temp libs --> - <exclude>dashboard/v2/node*/**</exclude> <!-- temp libs --> - <exclude>dashboard/v2/dist/**</exclude> <!-- package --> - <exclude>dashboard/v2/**/*.min.js*</exclude> <!-- minified JS --> + <exclude>dashboard/.bower-*/**</exclude> <!-- temp libs --> + <exclude>dashboard/lib/**</exclude> <!-- temp libs --> + <exclude>dashboard/node*/**</exclude> <!-- temp libs --> + <exclude>dashboard/dist/**</exclude> <!-- package --> + <exclude>dashboard/*.min.js*</exclude> <!-- minified JS --> </excludes> </fileSet> </fileSets> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a18e968..e8d18a2 100755 --- a/pom.xml +++ b/pom.xml @@ -1255,7 +1255,7 @@ <artifactId>frontend-maven-plugin</artifactId> <version>0.0.23</version> <configuration> - <workingDirectory>../dashboard/v2/</workingDirectory> + <workingDirectory>../dashboard/</workingDirectory> </configuration> </plugin> @@ -1552,19 +1552,19 @@ <exclude>**/.externalToolBuilders/**</exclude> <exclude>**/build.log</exclude> <!-- temp libs --> - <exclude>dashboard/**/.bower-*/**</exclude> + <exclude>dashboard/.bower-*/**</exclude> <!-- json file --> - <exclude>dashboard/v2/.bowerrc</exclude> + <exclude>dashboard/.bowerrc</exclude> <!-- temp libs --> - <exclude>dashboard/v2/lib/**</exclude> + <exclude>dashboard/lib/**</exclude> <!-- temp libs --> - <exclude>dashboard/v2/node*/**</exclude> + <exclude>dashboard/node*/**</exclude> <!-- package --> - <exclude>dashboard/v2/dist/**</exclude> + <exclude>dashboard/dist/**</exclude> <!-- lib files --> - <exclude>dashboard/v2/public/lib/**</exclude> + <exclude>dashboard/public/lib/**</exclude> <!-- minified JS --> - <exclude>dashboard/v2/**/*.min.js*</exclude> + <exclude>dashboard/**/*.min.js*</exclude> </excludes> </configuration> <executions> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/37db9955/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 851cbdc..26512ac 100644 --- a/release-log.txt +++ b/release-log.txt @@ -8,6 +8,7 @@ ATLAS-54 Rename configs in hive hook (shwethags) ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags) ALL CHANGES: +ATLAS-109 Remove v2 Folder (Vishal Kadam via Venkatesh Seetharam) ATLAS-90 Support offline builds (Vishal Kadam via Venkatesh Seetharam) ATLAS-154 Update website for 0.5-incubating release (Venkatesh Seetharam) ATLAS-153 Build failure - org.glassfish:javax.el (shwethags)
