atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shweth...@apache.org
Subject incubator-atlas git commit: ATLAS-502 UI: Provide the ability to search for tags (anilsg via shwethags)
Date Thu, 25 Feb 2016 08:38:10 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master ecd0f6105 -> 6a63f7154


ATLAS-502 UI: Provide the ability to search for tags (anilsg via shwethags)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/6a63f715
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/6a63f715
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/6a63f715

Branch: refs/heads/master
Commit: 6a63f7154720a8670064c5b6f5feb82dbb216489
Parents: ecd0f61
Author: Shwetha GS <sshivalingamurthy@hortonworks.com>
Authored: Thu Feb 25 14:08:00 2016 +0530
Committer: Shwetha GS <sshivalingamurthy@hortonworks.com>
Committed: Thu Feb 25 14:08:00 2016 +0530

----------------------------------------------------------------------
 dashboard/public/css/common.css                    | 17 ++++++++++++++++-
 .../modules/navigation/navigationController.js     | 10 ++++++++++
 .../modules/navigation/views/navigation.html       | 14 ++++++++++----
 release-log.txt                                    |  1 +
 4 files changed, 37 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6a63f715/dashboard/public/css/common.css
----------------------------------------------------------------------
diff --git a/dashboard/public/css/common.css b/dashboard/public/css/common.css
index 9d9b4d8..9becbed 100644
--- a/dashboard/public/css/common.css
+++ b/dashboard/public/css/common.css
@@ -349,4 +349,19 @@ Tags on Home Page design
 .notifier{
     margin-right: 15px;
     margin-left: -15px;
-}
\ No newline at end of file
+}
+.main-tags .list-tag{
+    height: 640px;
+    overflow-y: scroll;
+}
+.filter-tag{
+    width: 95%;
+    padding: 3px;
+    margin-left: 6px;
+    margin-top: 3px;
+    margin-bottom: 3px;
+}
+.see-more {
+    font-weight: bold;
+    font-size: 16px;
+} 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6a63f715/dashboard/public/modules/navigation/navigationController.js
----------------------------------------------------------------------
diff --git a/dashboard/public/modules/navigation/navigationController.js b/dashboard/public/modules/navigation/navigationController.js
index 491bdc8..b5a7a51 100644
--- a/dashboard/public/modules/navigation/navigationController.js
+++ b/dashboard/public/modules/navigation/navigationController.js
@@ -19,6 +19,8 @@
 
 angular.module('dgc.navigation').controller('navigationController', ['$scope', 'navigationResource',
'$cacheFactory', 'atlasConfig',
     function($scope, navigationResource, $cacheFactory, atlasConfig) {
+        var limitIntialCount = 18;
+        $scope.intialCount = limitIntialCount;
 
         $scope.updateVar = function(event) {
             $scope.$$prevSibling.query = angular.element(event.target).text();
@@ -38,7 +40,15 @@ angular.module('dgc.navigation').controller('navigationController', ['$scope',
'
             var httpDefaultCache = $cacheFactory.get('$http');
             httpDefaultCache.remove(atlasConfig.API_ENDPOINTS.TRAITS_LIST);
             $scope.leftnav = navigationResource.get();
+            $scope.intialCount = limitIntialCount;
         };
 
+        $scope.showMore = function(){
+            $scope.intialCount += limitIntialCount;
+        };
+
+        $scope.filterTags = function(){ 
+            $scope.intialCount = limitIntialCount; 
+        };
     }
 ]);

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6a63f715/dashboard/public/modules/navigation/views/navigation.html
----------------------------------------------------------------------
diff --git a/dashboard/public/modules/navigation/views/navigation.html b/dashboard/public/modules/navigation/views/navigation.html
index 90e603a..24216ea 100644
--- a/dashboard/public/modules/navigation/views/navigation.html
+++ b/dashboard/public/modules/navigation/views/navigation.html
@@ -19,11 +19,17 @@
 <div data-ng-controller="navigationController" class="main-tags leftNavigation"> 
     <div>
        <h4 class="pull-left">Tags</h4>  
-       <a href ng-click="refreshTags()" class="pull-right"> <img src="../img/refresh.png"
style="margin: 5px;" title="Refresh Tags" ></a>
-    </div>
-    </br>
+       <a href ng-click="refreshTags()" class="pull-right"> 
+         <img src="../img/refresh.png" style="margin: 5px;" title="Refresh Tags" >
+       </a>
+       <form ng-submit="filterTags()">
+         <input type="text" class="filter-tag" placeholder="Search for Tagsā€¦" ng-model="tagFilter"
ng-keydown="filterTags()"> </input>
+         <input type="submit" id="submit" value="Submit" class="hide" />
+       </form>
+    </div> 
     </br> 
     <div class="list-group">
-       <a ng-repeat="nav in leftnav" ui-sref="search({ query: nav })" class="list-group-item
limit-size" title="{{nav}}"><i class="fa fa-tag"></i> {{nav}} </a>
+       <a ng-repeat="nav in filtered = (leftnav | filter:tagFilter | limitTo:intialCount
+ 1)" ui-sref="search({ query: nav })" class="list-group-item limitSize" title="{{nav}}"><i
class="fa fa-tag"></i> {{nav}} </a>
+       <a ng-click="showMore()" class="see-more" ng-class="filtered.length > intialCount
? 'show' : 'hide'"> Load more ... </a>
     </div>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6a63f715/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 638911e..8663241 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via
shwethags)
 
 ALL CHANGES:
+ATLAS-502 UI: Provide the ability to search for tags (anilsg via shwethags)
 ATLAS-364 UI Code standardization (darshankumar89 via shwethags)
 ATLAS_396 Creating an entity with non-existing type results in "Unable to deserialize json"
error (guptaneeru via sumasai)
 ATLAS-318 Config file conatining API endpoint + all api calls to be centralized (sanjayp
via sumasai)


Mime
View raw message