atlas git commit: ATLAS-2970: UI: Show counts besides the Type and Classification dropdown list in search
Repository: atlas Updated Branches: refs/heads/branch-1.0 e21a2c479 -> 379dc7475 ATLAS-2970: UI: Show counts besides the Type and Classification dropdown list in search Signed-off-by: Sarath Subramanian (cherry picked from commit 2b9aa84d627ffec63a36ba345244703a8f4d557a) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/379dc747 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/379dc747 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/379dc747 Branch: refs/heads/branch-1.0 Commit: 379dc7475a135637186a2e699a48c90857d6f0f7 Parents: e21a2c4 Author: Abhishek Kadam Authored: Wed Nov 21 12:36:40 2018 -0800 Committer: Sarath Subramanian Committed: Wed Nov 21 12:37:10 2018 -0800 -- dashboardv2/public/js/main.js | 16 +++- dashboardv2/public/js/router/Router.js | 5 ++- dashboardv2/public/js/utils/UrlLinks.js | 3 ++ .../public/js/views/search/SearchLayoutView.js | 40 4 files changed, 45 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/379dc747/dashboardv2/public/js/main.js -- diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js index 510c48f..4accaac 100644 --- a/dashboardv2/public/js/main.js +++ b/dashboardv2/public/js/main.js @@ -200,7 +200,7 @@ require(['App', 'select2' ], function(App, Router, CommonViewFunction, Globals, UrlLinks, VEntityList, VTagList) { var that = this; -this.asyncFetchCounter = 5; +this.asyncFetchCounter = 6; this.entityDefCollection = new VEntityList(); this.entityDefCollection.url = UrlLinks.entitiesDefApiUrl(); this.typeHeaders = new VTagList(); @@ -209,12 +209,16 @@ require(['App', this.enumDefCollection.url = UrlLinks.enumDefApiUrl(); this.enumDefCollection.modelAttrName = "enumDefs"; this.classificationDefCollection = new VTagList(); +this.entityCountCollection = new VTagList(); +this.entityCountCollection.url = UrlLinks.entityCountApi(); +this.entityCountCollection.modelAttrName = "data"; App.appRouter = new Router({ entityDefCollection: this.entityDefCollection, typeHeaders: this.typeHeaders, enumDefCollection: this.enumDefCollection, -classificationDefCollection: this.classificationDefCollection +classificationDefCollection: this.classificationDefCollection, +entityCountCollection: this.entityCountCollection }); var startApp = function() { @@ -293,4 +297,12 @@ require(['App', startApp(); } }); + +this.entityCountCollection.fetch({ +skipDefaultError: true, +complete: function() { +--that.asyncFetchCounter; +startApp(); +} +}); }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/atlas/blob/379dc747/dashboardv2/public/js/router/Router.js -- diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js index daf7974..f323575 100644 --- a/dashboardv2/public/js/router/Router.js +++ b/dashboardv2/public/js/router/Router.js @@ -42,7 +42,7 @@ define([ '*actions': 'defaultAction' }, initialize: function(options) { -_.extend(this, _.pick(options, 'entityDefCollection', 'typeHeaders', 'enumDefCollection', 'classificationDefCollection')); +_.extend(this, _.pick(options, 'entityDefCollection', 'typeHeaders', 'enumDefCollection', 'classificationDefCollection', 'entityCountCollection')); this.showRegions(); this.bindCommonEvents(); this.listenTo(this, 'route', this.postRouteExecute, this); @@ -57,7 +57,8 @@ define([ 'typeHeaders': this.typeHeaders, 'enumDefCollection': this.enumDefCollection, 'classificationDefCollection': this.classificationDefCollection, -'glossaryCollection': this.glossaryCollection +'glossaryCollection': this.glossaryCollection, +'entityCountCollection': this.entityCountCollection } this.sharedObj = { searchTableColumns: {}, http://git-wip-us.apache.org/repos/asf/atlas/blob/379dc747/dashboardv2/public/js/utils/UrlLinks.js -- diff --git a/dashboardv2/public/js/utils/UrlLinks.js b/dashboardv2/public/js/utils/UrlLinks.js index b2ae619..1bc5949 100644 --- a/dashboardv2/public/js/utils/UrlLinks.js +++ b/dashboardv2/public/js/utils/UrlLinks.js @@ -40,6 +40,9 @@ define(['require', 'utils/Enums', 'utils/Utils', 'underscore'], function
atlas git commit: ATLAS-2970: UI: Show counts besides the Type and Classification dropdown list in search
Repository: atlas Updated Branches: refs/heads/master ed795dc4c -> 2b9aa84d6 ATLAS-2970: UI: Show counts besides the Type and Classification dropdown list in search Signed-off-by: Sarath Subramanian Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/2b9aa84d Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/2b9aa84d Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/2b9aa84d Branch: refs/heads/master Commit: 2b9aa84d627ffec63a36ba345244703a8f4d557a Parents: ed795dc Author: Abhishek Kadam Authored: Wed Nov 21 12:36:40 2018 -0800 Committer: Sarath Subramanian Committed: Wed Nov 21 12:36:40 2018 -0800 -- dashboardv2/public/js/main.js | 16 +++- dashboardv2/public/js/router/Router.js | 5 ++- dashboardv2/public/js/utils/UrlLinks.js | 3 ++ .../public/js/views/search/SearchLayoutView.js | 40 4 files changed, 45 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/2b9aa84d/dashboardv2/public/js/main.js -- diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js index 510c48f..4accaac 100644 --- a/dashboardv2/public/js/main.js +++ b/dashboardv2/public/js/main.js @@ -200,7 +200,7 @@ require(['App', 'select2' ], function(App, Router, CommonViewFunction, Globals, UrlLinks, VEntityList, VTagList) { var that = this; -this.asyncFetchCounter = 5; +this.asyncFetchCounter = 6; this.entityDefCollection = new VEntityList(); this.entityDefCollection.url = UrlLinks.entitiesDefApiUrl(); this.typeHeaders = new VTagList(); @@ -209,12 +209,16 @@ require(['App', this.enumDefCollection.url = UrlLinks.enumDefApiUrl(); this.enumDefCollection.modelAttrName = "enumDefs"; this.classificationDefCollection = new VTagList(); +this.entityCountCollection = new VTagList(); +this.entityCountCollection.url = UrlLinks.entityCountApi(); +this.entityCountCollection.modelAttrName = "data"; App.appRouter = new Router({ entityDefCollection: this.entityDefCollection, typeHeaders: this.typeHeaders, enumDefCollection: this.enumDefCollection, -classificationDefCollection: this.classificationDefCollection +classificationDefCollection: this.classificationDefCollection, +entityCountCollection: this.entityCountCollection }); var startApp = function() { @@ -293,4 +297,12 @@ require(['App', startApp(); } }); + +this.entityCountCollection.fetch({ +skipDefaultError: true, +complete: function() { +--that.asyncFetchCounter; +startApp(); +} +}); }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/atlas/blob/2b9aa84d/dashboardv2/public/js/router/Router.js -- diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js index daf7974..f323575 100644 --- a/dashboardv2/public/js/router/Router.js +++ b/dashboardv2/public/js/router/Router.js @@ -42,7 +42,7 @@ define([ '*actions': 'defaultAction' }, initialize: function(options) { -_.extend(this, _.pick(options, 'entityDefCollection', 'typeHeaders', 'enumDefCollection', 'classificationDefCollection')); +_.extend(this, _.pick(options, 'entityDefCollection', 'typeHeaders', 'enumDefCollection', 'classificationDefCollection', 'entityCountCollection')); this.showRegions(); this.bindCommonEvents(); this.listenTo(this, 'route', this.postRouteExecute, this); @@ -57,7 +57,8 @@ define([ 'typeHeaders': this.typeHeaders, 'enumDefCollection': this.enumDefCollection, 'classificationDefCollection': this.classificationDefCollection, -'glossaryCollection': this.glossaryCollection +'glossaryCollection': this.glossaryCollection, +'entityCountCollection': this.entityCountCollection } this.sharedObj = { searchTableColumns: {}, http://git-wip-us.apache.org/repos/asf/atlas/blob/2b9aa84d/dashboardv2/public/js/utils/UrlLinks.js -- diff --git a/dashboardv2/public/js/utils/UrlLinks.js b/dashboardv2/public/js/utils/UrlLinks.js index b2ae619..1bc5949 100644 --- a/dashboardv2/public/js/utils/UrlLinks.js +++ b/dashboardv2/public/js/utils/UrlLinks.js @@ -40,6 +40,9 @@ define(['require', 'utils/Enums', 'utils/Utils', 'underscore'], function(require enumDefApiUrl: function(name) { return this.ge