This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push: new 714423c ATLAS-3523: UI doesn't pick _CLASSIFIED , _NOT_CLASSIFIED on selecting the same. 714423c is described below commit 714423c9135653fd3351cfe9282f05ae1fa0870b Author: sameer79 <findsameersha...@yahoo.co.in> AuthorDate: Wed Nov 13 18:54:43 2019 +0530 ATLAS-3523: UI doesn't pick _CLASSIFIED , _NOT_CLASSIFIED on selecting the same. Signed-off-by: nixonrodrigues <ni...@apache.org> --- dashboardv2/public/js/router/Router.js | 10 ++++++++-- dashboardv2/public/js/utils/Enums.js | 6 ++++-- .../public/js/views/detail_page/DetailPageLayoutView.js | 4 ++-- .../public/js/views/glossary/GlossaryDetailLayoutView.js | 2 +- dashboardv3/public/js/router/Router.js | 8 +++++++- dashboardv3/public/js/utils/Enums.js | 6 +++--- .../public/js/views/detail_page/DetailPageLayoutView.js | 4 ++-- .../public/js/views/glossary/GlossaryDetailLayoutView.js | 2 +- 8 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js index 963d63e..e45f0fb 100644 --- a/dashboardv2/public/js/router/Router.js +++ b/dashboardv2/public/js/router/Router.js @@ -24,8 +24,9 @@ define([ 'utils/Globals', 'utils/Utils', 'utils/UrlLinks', + 'utils/Enums', 'collection/VGlossaryList' -], function($, _, Backbone, App, Globals, Utils, UrlLinks, VGlossaryList) { +], function($, _, Backbone, App, Globals, Utils, UrlLinks, Enums, VGlossaryList) { var AppRouter = Backbone.Router.extend({ routes: { // Define some URL routes @@ -323,6 +324,11 @@ define([ } } }); + _.each(Enums.addOnClassification, function(classificationName) { + if (classificationName === tagValidate) { + isTagPresent = true; + } + }); if (!isTagPresent) { paramObj.tag = null; } @@ -373,4 +379,4 @@ define([ } }); return AppRouter; -}); \ No newline at end of file +}); diff --git a/dashboardv2/public/js/utils/Enums.js b/dashboardv2/public/js/utils/Enums.js index c7316d5..58542ec 100644 --- a/dashboardv2/public/js/utils/Enums.js +++ b/dashboardv2/public/js/utils/Enums.js @@ -35,7 +35,9 @@ define(['require'], function(require) { ENTITY_IMPORT_UPDATE: "Entity Updated by import", ENTITY_IMPORT_DELETE: "Entity Deleted by import", TERM_ADD: "Term Added", - TERM_DELETE: "Term Deleted" + TERM_DELETE: "Term Deleted", + LABEL_ADD: "Label(s) Added", + LABEL_DELETE:"Label(s) Deleted" } Enums.entityStateReadOnly = { @@ -190,4 +192,4 @@ define(['require'], function(require) { } }; return Enums; -}); \ No newline at end of file +}); diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js index ef3f115..8ef9c91 100644 --- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js +++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js @@ -405,10 +405,10 @@ define(['require', val.entityGuid === that.id ? tag['self'].push(val) : tag['propagated'].push(val); }); _.each(tag.self, function(val) { - tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span title=' + val.typeName + ' >' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove Tag"></i></span>'; + tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span title=' + val.typeName + ' >' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove Classification"></i></span>'; }); _.each(tag.propagated, function(val) { - var crossButton = '<i class="fa fa-close" data-id="deleteTag" data-entityguid="' + val.entityGuid + '" data-type="tag" title="Remove Tag"></i>'; + var crossButton = '<i class="fa fa-close" data-id="deleteTag" data-entityguid="' + val.entityGuid + '" data-type="tag" title="Remove Classification"></i>'; propagatedTagListData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClick"><span>' + val.typeName + '</span>' + ((that.id !== val.entityGuid && val.entityStatus === "DELETED") ? crossButton : "") + '</span>'; }); propagatedTagListData !== "" ? this.ui.propagatedTagDiv.show() : this.ui.propagatedTagDiv.hide(); diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js index aaae651..a99dfaa 100644 --- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js +++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js @@ -301,7 +301,7 @@ define(['require', var that = this, tagData = ""; _.each(tagObject, function(val) { - tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title=' + val.typeName + '>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove Tag"></i></span>'; + tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title=' + val.typeName + '>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove Classification"></i></span>'; }); this.ui.tagList.find("span.btn").remove(); this.ui.tagList.prepend(tagData); diff --git a/dashboardv3/public/js/router/Router.js b/dashboardv3/public/js/router/Router.js index dc09d29..0388ebd 100644 --- a/dashboardv3/public/js/router/Router.js +++ b/dashboardv3/public/js/router/Router.js @@ -24,8 +24,9 @@ define([ "utils/Globals", "utils/Utils", "utils/UrlLinks", + 'utils/Enums', "collection/VGlossaryList" -], function($, _, Backbone, App, Globals, Utils, UrlLinks, VGlossaryList) { +], function($, _, Backbone, App, Globals, Utils, UrlLinks, Enums, VGlossaryList) { var AppRouter = Backbone.Router.extend({ routes: { // Define some URL routes @@ -300,6 +301,11 @@ define([ } } }); + _.each(Enums.addOnClassification, function(classificationName) { + if (classificationName === tagValidate) { + isTagPresent = true; + } + }); if (!isTagPresent) { paramObj.tag = null; } diff --git a/dashboardv3/public/js/utils/Enums.js b/dashboardv3/public/js/utils/Enums.js index 74a08d9..58542ec 100644 --- a/dashboardv3/public/js/utils/Enums.js +++ b/dashboardv3/public/js/utils/Enums.js @@ -36,8 +36,8 @@ define(['require'], function(require) { ENTITY_IMPORT_DELETE: "Entity Deleted by import", TERM_ADD: "Term Added", TERM_DELETE: "Term Deleted", - LABEL_ADD: "Label Added", - LABEL_DELETE: "Label Deleted" + LABEL_ADD: "Label(s) Added", + LABEL_DELETE:"Label(s) Deleted" } Enums.entityStateReadOnly = { @@ -192,4 +192,4 @@ define(['require'], function(require) { } }; return Enums; -}); \ No newline at end of file +}); diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js index 66d1163..819297c 100644 --- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js +++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js @@ -414,10 +414,10 @@ define(['require', val.entityGuid === that.id ? tag['self'].push(val) : tag['propagated'].push(val); }); _.each(tag.self, function(val) { - tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span title=' + val.typeName + ' >' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove Tag"></i></span>'; + tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span title=' + val.typeName + ' >' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Remove Classification"></i></span>'; }); _.each(tag.propagated, function(val) { - var crossButton = '<i class="fa fa-close" data-id="deleteTag" data-entityguid="' + val.entityGuid + '" data-type="tag" title="Remove Tag"></i>'; + var crossButton = '<i class="fa fa-close" data-id="deleteTag" data-entityguid="' + val.entityGuid + '" data-type="tag" title="Remove Classification"></i>'; propagatedTagListData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClick"><span>' + val.typeName + '</span>' + ((that.id !== val.entityGuid && val.entityStatus === "DELETED") ? crossButton : "") + '</span>'; }); propagatedTagListData !== "" ? this.ui.propagatedTagDiv.show() : this.ui.propagatedTagDiv.hide(); diff --git a/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js b/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js index 821769a..be480bf 100644 --- a/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js +++ b/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js @@ -316,7 +316,7 @@ define(['require', var that = this, tagData = ""; _.each(tagObject, function(val) { - tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title=' + val.typeName + '>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove Tag"></i></span>'; + tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClickTerm"><span title=' + val.typeName + '>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove Classification"></i></span>'; }); this.ui.tagList.find("span.btn").remove(); this.ui.tagList.prepend(tagData);