You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2020/05/21 16:49:21 UTC
[atlas] 01/05: ATLAS-3791:- New UI: In valid option are visible For
_CLASSIFIED , _NOT_CLASSIFIED, _ALL_CLASSIFICATION_TYPES
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 887087d9b9de0e2cf932c4ddd337693efbbd3ddd
Author: kevalbhatt <kb...@apache.org>
AuthorDate: Thu May 21 13:38:53 2020 +0530
ATLAS-3791:- New UI: In valid option are visible For _CLASSIFIED , _NOT_CLASSIFIED, _ALL_CLASSIFICATION_TYPES
---
.../js/views/search/SearchFilterBrowseLayoutView.js | 3 +++
.../views/search/tree/ClassificationTreeLayoutView.js | 18 ++++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/dashboardv3/public/js/views/search/SearchFilterBrowseLayoutView.js b/dashboardv3/public/js/views/search/SearchFilterBrowseLayoutView.js
index 9e5fe64..d26a6e8 100644
--- a/dashboardv3/public/js/views/search/SearchFilterBrowseLayoutView.js
+++ b/dashboardv3/public/js/views/search/SearchFilterBrowseLayoutView.js
@@ -201,6 +201,9 @@ define([
if (options) {
_.extend(this.options, options);
this.showHideGlobalFilter();
+ if(!this.options.value){
+ this.ui.searchNode.val('').trigger('keyup');
+ }
if (this.RBusinessMetadataTreeRender.currentView) {
this.RBusinessMetadataTreeRender.currentView.manualRender(this.options);
}
diff --git a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index 899c465..67ac7c6 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -254,9 +254,14 @@ define([
popoverOptions: {
selector: '.classificationPopover',
content: function() {
- var type = $(this).data('detail'),
- liString = " <li><i class='fa fa-plus'></i><a href='javascript:void(0)' data-fn='onClickCreateTag'>Create Sub-classification</a></li><li><i class='fa fa-list-alt'></i><a href='javascript:void(0)' data-fn='onViewEdit'>View/Edit</a></li><li><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='onDelete'>Delete</a></li><li><i class='fa fa-search'></i><a href='javascript:void(0)' data-fn='onSelectedSearch'>Search</a></li>"
- return "<ul>" + liString + "</ul>";
+ var name = this.dataset.name || null,
+ searchString = "<li><i class='fa fa-search'></i><a href='javascript:void(0)' data-fn='onSelectedSearch'>Search</a></li>";
+ if (name && Enums.addOnClassification.includes(name)) {
+ return "<ul>" + searchString + "</ul>";
+ } else {
+ var liString = " <li><i class='fa fa-plus'></i><a href='javascript:void(0)' data-fn='onClickCreateTag'>Create Sub-classification</a></li><li><i class='fa fa-list-alt'></i><a href='javascript:void(0)' data-fn='onViewEdit'>View/Edit</a></li><li><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='onDelete'>Delete</a></li>";
+ return "<ul>" + liString + searchString + "</ul>";
+ }
}
}
});
@@ -581,9 +586,10 @@ define([
},
node_customize: {
default: function(el) {
- var aTag = $(el).find(">a.jstree-anchor");
- aTag.append("<span class='tree-tooltip'>" + aTag.text() + "</span>");
- $(el).append('<div class="tools"><i class="fa fa-ellipsis-h classificationPopover" rel="popover"></i></div>');
+ var aTag = $(el).find(">a.jstree-anchor"),
+ nameText = aTag.text();
+ aTag.append("<span class='tree-tooltip'>" + nameText + "</span>");
+ $(el).append('<div class="tools"><i class="fa fa-ellipsis-h classificationPopover" rel="popover" data-name=' + nameText + '></i></div>');
}
},
core: {