Commit 86494ffd by Suma Shivaprasad

ATLAS-848 Atlas UI: Search term box in left navigation is not auto…

ATLAS-848 Atlas UI: Search term box in left navigation is not auto refresh.(Kalyanikashikar via sumasai)
parent d41e549f
...@@ -102,7 +102,7 @@ button:focus { ...@@ -102,7 +102,7 @@ button:focus {
border-radius: 4px; border-radius: 4px;
//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10) //Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
transition: all .3s ease; transition: all .3s ease;
margin:2px; margin: 2px;
&.cancel { &.cancel {
background-color: $transparent; background-color: $transparent;
color: $color_keppel_approx; color: $color_keppel_approx;
...@@ -142,21 +142,22 @@ button:focus { ...@@ -142,21 +142,22 @@ button:focus {
background-color: $transparent; background-color: $transparent;
color: $color_keppel_approx; color: $color_keppel_approx;
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 4px;
padding: 5px 10px;
&:hover { &:hover {
color: $color_keppel_approx; background-color: $color_keppel_approx;
} color: $white;
&:focus {
background-color: $transparent;
color: $color_keppel_approx;
} }
} }
.input-spacing { .input-spacing {
padding-bottom: 10px!important; padding-bottom: 10px!important;
} }
.input-group-btn .glyphicon { .input-group-btn .glyphicon {
top: 2px; top: 2px;
} }
.pagination > .active { .pagination > .active {
> a { > a {
background-color: $color_curious_blue_approx; background-color: $color_curious_blue_approx;
...@@ -170,7 +171,6 @@ button:focus { ...@@ -170,7 +171,6 @@ button:focus {
border-color: $color_curious_blue_approx; border-color: $color_curious_blue_approx;
} }
} }
> span { > span {
background-color: $color_curious_blue_approx; background-color: $color_curious_blue_approx;
border-color: $color_curious_blue_approx; border-color: $color_curious_blue_approx;
......
...@@ -17,8 +17,9 @@ ...@@ -17,8 +17,9 @@
<div class="form-group"> <div class="form-group">
<select type="text" class="form-control" data-id="searchTermInput" placeholder="Search term"></select> <select type="text" class="form-control" data-id="searchTermInput" placeholder="Search term"></select>
</div> </div>
<div class="row"> <div class="clearfix">
<button class="btn btn-taxanomyBack btn-atlas" data-id="backTaxanomy"><i class="fa fa-chevron-left"></i> Back</button> <button class="btn btn-taxanomyBack btn-atlas pull-left" data-id="backTaxanomy"><i class="fa fa-chevron-left"></i> Back</button>
<button class="btn btn-taxanomyBack btn-atlas pull-right" data-id="refreshTaxanomy"><i class="fa fa-refresh"></i> Refresh</button>
</div> </div>
<div class=""> <div class="">
<ul class="taxonomyTree"> <ul class="taxonomyTree">
......
...@@ -41,7 +41,8 @@ define(['require', ...@@ -41,7 +41,8 @@ define(['require',
liClick: 'li a[data-href]', liClick: 'li a[data-href]',
backTaxanomy: '[data-id="backTaxanomy"]', backTaxanomy: '[data-id="backTaxanomy"]',
expandArrow: '[data-id="expandArrow"]', expandArrow: '[data-id="expandArrow"]',
searchTermInput: '[data-id="searchTermInput"]' searchTermInput: '[data-id="searchTermInput"]',
refreshTaxanomy: '[data-id="refreshTaxanomy"]'
}, },
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
...@@ -56,6 +57,7 @@ define(['require', ...@@ -56,6 +57,7 @@ define(['require',
this.forwardClick(e); this.forwardClick(e);
}; };
events['click ' + this.ui.backTaxanomy] = 'backButtonTaxanomy'; events['click ' + this.ui.backTaxanomy] = 'backButtonTaxanomy';
events['click ' + this.ui.refreshTaxanomy] = 'refreshButtonTaxanomy';
events['click ' + this.ui.expandArrow] = 'changeArrowState'; events['click ' + this.ui.expandArrow] = 'changeArrowState';
events["change " + this.ui.searchTermInput] = function() { events["change " + this.ui.searchTermInput] = function() {
this.singleClick = false; this.singleClick = false;
...@@ -288,13 +290,11 @@ define(['require', ...@@ -288,13 +290,11 @@ define(['require',
createTaxonomy(); createTaxonomy();
} else { } else {
this.changeArrowState(); this.changeArrowState();
/* if (!this.create) {
this.changeArrowState();
} else {
this.create = false;
}*/
createTerm(); createTerm();
}
if (this.refresh) {
this.$('.taxonomyTree').find('a[data-href="' + this.refresh + '"]').parent().addClass('active');
this.refresh = undefined;
} }
this.$('.taxanomyloader').hide(); this.$('.taxanomyloader').hide();
this.$('.contentLoading').hide(); this.$('.contentLoading').hide();
...@@ -354,6 +354,7 @@ define(['require', ...@@ -354,6 +354,7 @@ define(['require',
view.model.set({ description: view.ui.termDetail.val() }).save(null, { view.model.set({ description: view.ui.termDetail.val() }).save(null, {
success: function(model, response) { success: function(model, response) {
that.create = true; that.create = true;
that.fetchTaxanomyCollections();
that.forwardClick(undefined, true, url); that.forwardClick(undefined, true, url);
//that.fetchCollection(that.url); //that.fetchCollection(that.url);
Utils.notifySuccess({ Utils.notifySuccess({
...@@ -472,7 +473,13 @@ define(['require', ...@@ -472,7 +473,13 @@ define(['require',
placeholder: "Search Term", placeholder: "Search Term",
allowClear: true allowClear: true
}); });
} },
refreshButtonTaxanomy: function() {
this.fetchTaxanomyCollections();
this.refresh = this.$('.taxonomyTree').find('.active a').data('href');
this.fetchCollection(this.url);
this.changeArrowState();
},
}); });
return BusinessCatalogLayoutView; return BusinessCatalogLayoutView;
}); });
...@@ -22,6 +22,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ...@@ -22,6 +22,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) ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES: ALL CHANGES:
ATLAS-848 Atlas UI: Search term box in left navigation is not auto refresh.(Kalyanikashikar via sumasai)
ATLAS-793 Business Catalog Delete (jspeidel via yhemanth) ATLAS-793 Business Catalog Delete (jspeidel via yhemanth)
ATLAS-846 Atlas UI : Add Pagination to Tags and Terms tabs of asset detailes page (kevalbhatt18 via yhemanth) ATLAS-846 Atlas UI : Add Pagination to Tags and Terms tabs of asset detailes page (kevalbhatt18 via yhemanth)
ATLAS-503 Lock exceptions occurring due to concurrent updates to backend stores (yhemanth) ATLAS-503 Lock exceptions occurring due to concurrent updates to backend stores (yhemanth)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment