You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by pi...@apache.org on 2021/09/17 06:27:33 UTC
[atlas] 01/03: ATLAS-4412:UI: Don't show isComplete attribute on
Entity detail page when it's value is false, fixed
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 068d1fae3fffe9207e10a62c53f41dc38b9251d9
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Tue Sep 7 16:24:37 2021 +0530
ATLAS-4412:UI: Don't show isComplete attribute on Entity detail page when it's value is false,fixed
Signed-off-by: Pinal Shah <pi...@freestoneinfotech.com>
---
dashboardv2/public/js/utils/CommonViewFunction.js | 3 +++
dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js | 2 +-
dashboardv3/public/js/utils/CommonViewFunction.js | 3 +++
dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js
index 899acf1..f7400c2 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -279,6 +279,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
var keyValue = valueObject[key],
listCount = "";
+ if (key == "isIncomplete" && keyValue == false) {
+ return;
+ }
if (showListCount && _.isArray(keyValue) && keyValue.length > 0) {
listCount = (valueObject && valueObject.paramsCount != undefined) ? (numberFormat(valueObject.paramsCount) != 0) ? ' (' + numberFormat(valueObject.paramsCount) + ')' : '' : ' (' + numberFormat(keyValue.length) + ')';
}
diff --git a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
index a5b5262..5eee4d7 100644
--- a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -79,7 +79,7 @@ define(['require',
highlightString = $(".atlas-header .global-search-container input.global-search").val(),
table = CommonViewFunction.propertyTable({
scope: this,
- valueObject: _.extend({ "isIncomplete": this.entity.isIncomplete }, this.entity.attributes),
+ valueObject: _.extend({ "isIncomplete": this.entity.isIncomplete || false }, this.entity.attributes),
attributeDefs: this.attributeDefs,
highlightString: highlightString
});
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js b/dashboardv3/public/js/utils/CommonViewFunction.js
index 8a95a47..07954c0 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -279,6 +279,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
var keyValue = valueObject[key],
listCount = "";
+ if (key == "isIncomplete" && keyValue == false) {
+ return;
+ }
if (showListCount && _.isArray(keyValue) && keyValue.length > 0) {
listCount = (valueObject && valueObject.paramsCount != undefined) ? (numberFormat(valueObject.paramsCount) != 0) ? ' (' + numberFormat(valueObject.paramsCount) + ')' : '' : ' (' + numberFormat(keyValue.length) + ')';
}
diff --git a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
index a5b5262..5eee4d7 100644
--- a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -79,7 +79,7 @@ define(['require',
highlightString = $(".atlas-header .global-search-container input.global-search").val(),
table = CommonViewFunction.propertyTable({
scope: this,
- valueObject: _.extend({ "isIncomplete": this.entity.isIncomplete }, this.entity.attributes),
+ valueObject: _.extend({ "isIncomplete": this.entity.isIncomplete || false }, this.entity.attributes),
attributeDefs: this.attributeDefs,
highlightString: highlightString
});