Commit b66f0572 by Hemanth Yamijala

ATLAS-852 Change Default landing page to taxonomy (kevalbhatt18 via yhemanth)

parent d661964c
...@@ -246,6 +246,14 @@ define([ ...@@ -246,6 +246,14 @@ define([
}, },
defaultAction: function(actions) { defaultAction: function(actions) {
// We have no matching route, lets just log what the URL was // We have no matching route, lets just log what the URL was
Utils.setUrl({
url: '#!/taxonomy',
mergeBrowserUrl: false,
updateTabState: function() {
return { taxonomyUrl: this.url, stateChanged: false };
},
trigger: true
});
console.log('No route:', actions); console.log('No route:', actions);
} }
}); });
......
...@@ -19,16 +19,16 @@ ...@@ -19,16 +19,16 @@
<a href="index.html"><i class="fa fa-globe"></i> Apache Atlas</a> <a href="index.html"><i class="fa fa-globe"></i> Apache Atlas</a>
</li> </li>
<ul class="tabs" style="width: 100%;" role="tablist"> <ul class="tabs" style="width: 100%;" role="tablist">
<li role="presentation" class="tab col-sm-4 active"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab">Tags</a></li> <li role="presentation" class="tab col-sm-4"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab">Tags</a></li>
<li role="presentation" class="tab col-sm-4"><a href="#tab-taxonomy" aria-controls="tab-taxonomy" data-name="tab-taxonomy" role="tab" data-toggle="tab" class="">Taxonomy</a></li> <li role="presentation" class="tab col-sm-4 active"><a href="#tab-taxonomy" aria-controls="tab-taxonomy" data-name="tab-taxonomy" role="tab" data-toggle="tab" class="">Taxonomy</a></li>
<li role="presentation" class="tab col-sm-4"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li> <li role="presentation" class="tab col-sm-4"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li>
</ul> </ul>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="tab-tag"> <div role="tabpanel" class="tab-pane" id="tab-tag">
<div id="r_tagLayoutView"></div> <div id="r_tagLayoutView"></div>
</div> </div>
<div role="tabpanel" class="tab-pane" id="tab-taxonomy"> <div role="tabpanel" class="tab-pane active" id="tab-taxonomy">
<div id="r_businessCatalogLayoutView"></div> <div id="r_businessCatalogLayoutView"></div>
</div> </div>
<div role="tabpanel" class="tab-pane" id="tab-search"> <div role="tabpanel" class="tab-pane" id="tab-search">
......
...@@ -86,7 +86,7 @@ define(['require', ...@@ -86,7 +86,7 @@ define(['require',
if (this.parentCollection.fullCollection.models.length) { if (this.parentCollection.fullCollection.models.length) {
this.generateTree(true); this.generateTree(true);
} else { } else {
if (Utils.getUrlState.isTaxonomyTab()) { if (Utils.getUrlState.isTaxonomyTab() || Utils.getUrlState.isInitial()) {
this.createDefaultTaxonomy(); this.createDefaultTaxonomy();
} }
} }
...@@ -328,6 +328,9 @@ define(['require', ...@@ -328,6 +328,9 @@ define(['require',
that.$('.termPopover').not(this).popover('hide'); that.$('.termPopover').not(this).popover('hide');
$(this).popover('toggle'); $(this).popover('toggle');
}); });
if (Utils.getUrlState.isInitial()) {
this.forwardClick();
}
}, },
onAddTerm: function(e) { onAddTerm: function(e) {
var that = this; var that = this;
......
...@@ -109,7 +109,7 @@ define(['require', ...@@ -109,7 +109,7 @@ define(['require',
} }
}, },
setValues: function(manual) { setValues: function(manual) {
if (Utils.getUrlState.isTagTab() || Utils.getUrlState.isInitial()) { if (Utils.getUrlState.isTagTab()) {
if (!this.tag) { if (!this.tag) {
this.selectFirst = false; this.selectFirst = false;
this.ui.tagsParent.find('li').first().addClass('active'); this.ui.tagsParent.find('li').first().addClass('active');
......
...@@ -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-852 Change Default landing page to taxonomy (kevalbhatt18 via yhemanth)
ATLAS-858 Unable to delete terms via API which are 3 or more levels deep (jspeidel via sumasai) ATLAS-858 Unable to delete terms via API which are 3 or more levels deep (jspeidel via sumasai)
ATLAS-848 Atlas UI: Search term box in left navigation is not auto refresh.(Kalyanikashikar via sumasai) 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)
......
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