Repository: incubator-atlas Updated Branches: refs/heads/master d661964c2 -> b66f05729
ATLAS-852 Change Default landing page to taxonomy (kevalbhatt18 via yhemanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/b66f0572 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/b66f0572 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/b66f0572 Branch: refs/heads/master Commit: b66f05729d11327ac5945032f5f6376255983266 Parents: d661964 Author: Hemanth Yamijala <[email protected]> Authored: Tue Jun 7 11:57:52 2016 +0530 Committer: Hemanth Yamijala <[email protected]> Committed: Tue Jun 7 11:57:52 2016 +0530 ---------------------------------------------------------------------- dashboardv2/public/js/router/Router.js | 8 ++++++++ .../templates/business_catalog/SideNavLayoutView_tmpl.html | 8 ++++---- .../js/views/business_catalog/BusinessCatalogLayoutView.js | 5 ++++- dashboardv2/public/js/views/tag/TagLayoutView.js | 2 +- release-log.txt | 1 + 5 files changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b66f0572/dashboardv2/public/js/router/Router.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js index 4d89ab8..64605bd 100644 --- a/dashboardv2/public/js/router/Router.js +++ b/dashboardv2/public/js/router/Router.js @@ -246,6 +246,14 @@ define([ }, defaultAction: function(actions) { // 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); } }); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b66f0572/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html index a59fb58..6d504ba 100644 --- a/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html +++ b/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html @@ -19,16 +19,16 @@ <a href="index.html"><i class="fa fa-globe"></i> Apache Atlas</a> </li> <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-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-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 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> </ul> </ul> <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> - <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> <div role="tabpanel" class="tab-pane" id="tab-search"> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b66f0572/dashboardv2/public/js/views/business_catalog/BusinessCatalogLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/business_catalog/BusinessCatalogLayoutView.js b/dashboardv2/public/js/views/business_catalog/BusinessCatalogLayoutView.js index 3e88b6d..d4b352d 100644 --- a/dashboardv2/public/js/views/business_catalog/BusinessCatalogLayoutView.js +++ b/dashboardv2/public/js/views/business_catalog/BusinessCatalogLayoutView.js @@ -86,7 +86,7 @@ define(['require', if (this.parentCollection.fullCollection.models.length) { this.generateTree(true); } else { - if (Utils.getUrlState.isTaxonomyTab()) { + if (Utils.getUrlState.isTaxonomyTab() || Utils.getUrlState.isInitial()) { this.createDefaultTaxonomy(); } } @@ -328,6 +328,9 @@ define(['require', that.$('.termPopover').not(this).popover('hide'); $(this).popover('toggle'); }); + if (Utils.getUrlState.isInitial()) { + this.forwardClick(); + } }, onAddTerm: function(e) { var that = this; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b66f0572/dashboardv2/public/js/views/tag/TagLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js b/dashboardv2/public/js/views/tag/TagLayoutView.js index 03adfbc..dd982de 100644 --- a/dashboardv2/public/js/views/tag/TagLayoutView.js +++ b/dashboardv2/public/js/views/tag/TagLayoutView.js @@ -109,7 +109,7 @@ define(['require', } }, setValues: function(manual) { - if (Utils.getUrlState.isTagTab() || Utils.getUrlState.isInitial()) { + if (Utils.getUrlState.isTagTab()) { if (!this.tag) { this.selectFirst = false; this.ui.tagsParent.find('li').first().addClass('active'); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/b66f0572/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index eec7d48..71e6ff4 100644 --- a/release-log.txt +++ b/release-log.txt @@ -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) 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-848 Atlas UI: Search term box in left navigation is not auto refresh.(Kalyanikashikar via sumasai) ATLAS-793 Business Catalog Delete (jspeidel via yhemanth)
