ATLAS-214 and ATLAS-219 - hive_table schema display , Add ability to …

…detach trait from the entity
MPR-Global · Nov 3, 2015 · 8cadfd7 · 8cadfd7
1 parent 69185f2
commit 8cadfd7
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 3 deletions.
diff --git a/dashboard/public/css/common.css b/dashboard/public/css/common.css
@@ -337,3 +337,12 @@ Tags on Home Page design
     white-space: nowrap;
     text-transform: capitalize; 
 }
+
+.maxwidth125px {
+    max-width: 125px !important;
+}
+
+.anchorAbsolute {
+    position: absolute;
+    right: 4px;
+}
diff --git a/dashboard/public/css/tags.css b/dashboard/public/css/tags.css
@@ -97,6 +97,7 @@
 	border:none;
 	padding: 2px;
 	background-color: inherit;
+  padding-right: 20px !important;
 }
 .addTag{
 	text-align: center;

diff --git a/dashboard/public/modules/details/detailsController.js b/dashboard/public/modules/details/detailsController.js
@@ -30,7 +30,7 @@ angular.module('dgc.details').controller('DetailsController', ['$window', '$scop
             console.log(data);
             $scope.schemas = data;
             $scope.tableName = data.values.name;
-            $scope.isTable = data.typeName === 'Table';
+            $scope.isTable = (typeof data.typeName != 'undefined' && data.typeName.toLowerCase().indexOf('table') != -1) ? true : false;
             $scope.onActivate('io');
         });
 

diff --git a/dashboard/public/modules/details/detailsResource.js b/dashboard/public/modules/details/detailsResource.js
@@ -32,6 +32,10 @@ angular.module('dgc.details').factory('DetailsResource', ['$resource', function(
         saveTag: {
             method: 'POST',
             url: '/api/atlas/entity/:id/traits'
+        },
+        detachTag : {
+            method: 'DELETE',
+            url: '/api/atlas/entity/:id/traits/:tagName'
         }
     });
 

diff --git a/dashboard/public/modules/tags/instance/instanceTagsController.js b/dashboard/public/modules/tags/instance/instanceTagsController.js
@@ -48,6 +48,26 @@ angular.module('dgc.tags.instance').controller('InstanceTagController', ['$scope
                 id: $scope.id
             });
         };
+
+        $scope.detachTag = function($event, name) {
+            var r = confirm("Please confirm delete.");
+            if (r == true) {
+                DetailsResource.detachTag({
+                    id: $stateParams.id,
+                    tagName: name
+                }, function(data) {
+                    console.log("Detached Tag");
+                    console.log(data);
+
+                    if (data.requestId != undefined && data.GUID == $stateParams.id && data.traitName == name) {
+                        var curent = $event.currentTarget;
+                        curent.parentElement.remove();
+                        $(".popover").remove();
+                    }
+                });
+            }
+        };
+
         getResourceData();
         $scope.$on('refreshResourceData', getResourceData);
     }

diff --git a/dashboard/public/modules/tags/instance/views/tags.html b/dashboard/public/modules/tags/instance/views/tags.html
@@ -19,8 +19,8 @@
   <div class="container tag-list wordBreak">
     <h4>Tags</h4>
     <ul>
-      <li ng-repeat="trait in traitsList" class="list-group-item pointer tabsearchanchor" popover="{{trait.values}}" popover-title="{{trait.typeName}} Values" popover-trigger="mouseenter" >
-        {{trait.typeName}} </li>
+      <li ng-repeat="trait in traitsList" class="list-group-item pointer tabsearchanchor maxwidth125px" popover="{{trait.values}}" popover-title="{{trait.typeName}} Values" popover-trigger="mouseenter" >
+        {{trait.typeName}} <a href="" class="anchorAbsolute" ng-click="detachTag($event, trait.typeName)"> <i class="fa fa-times"></i> </a> </li>
 
       <li class="list-group-item"><a ng-click="openAddTag()" href=""
         class="add-tag btn btn-primary">Add tag</a></li>