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:32 UTC

[atlas] branch master updated (98b43fc -> 3ad3f30)

This is an automated email from the ASF dual-hosted git repository.

pinal pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git.


    from 98b43fc  ATLAS-4422 : Quick Search: Provide sorting
     new 068d1fa  ATLAS-4412:UI: Don't show isComplete attribute on Entity detail page when it's value is false,fixed
     new b9d4dd1  ATLAS-4414:#1 UI: (New UI) Clicking the clear button should erase the search input in advanced DSL pop-up box (drop-down), fixed
     new 3ad3f30  ATLAS-4418:#1 UI: (New UI) Saved Advanced search filter parameters are not present in the advanced dsl search popup box after selection, fixed

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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 +-
 dashboardv3/public/js/views/search/SearchDefaultLayoutView.js         | 3 +++
 dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js | 4 ++++
 6 files changed, 15 insertions(+), 2 deletions(-)

[atlas] 01/03: ATLAS-4412:UI: Don't show isComplete attribute on Entity detail page when it's value is false, fixed

Posted by pi...@apache.org.
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
                     });

[atlas] 03/03: ATLAS-4418:#1 UI: (New UI) Saved Advanced search filter parameters are not present in the advanced dsl search popup box after selection, fixed

Posted by pi...@apache.org.
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 3ad3f30ee5b74c1b231e82c4dd414da07b6a36c1
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Tue Sep 14 21:21:22 2021 +0530

    ATLAS-4418:#1 UI: (New UI) Saved Advanced search filter parameters are not present in the advanced dsl search popup box after selection, fixed
    
    Signed-off-by: Pinal Shah <pi...@freestoneinfotech.com>
---
 dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
index 8e4b4b3..eadd641 100644
--- a/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
@@ -369,6 +369,10 @@ define([
                             entityDefCollection: that.entityDefCollection
                         });
                     searchType === 'ADVANCED' ? that.isBasic = false : that.isBasic = true;
+                    if (searchType === 'ADVANCED') {
+                        Globals.advanceSearchData.searchByQuery = searchParameters.query;
+                        Globals.advanceSearchData.searchByType = searchParameters.typeName;
+                    }
                     _.extend({}, this.options.value, params);
                     // Utils.notifyInfo({
                     //     content: "Saved values are selected."

[atlas] 02/03: ATLAS-4414:#1 UI: (New UI) Clicking the clear button should erase the search input in advanced DSL pop-up box (drop-down), fixed

Posted by pi...@apache.org.
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 b9d4dd113a8ac12227b301daba3065f64d749d1d
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Wed Sep 8 14:27:16 2021 +0530

    ATLAS-4414:#1 UI: (New UI) Clicking the clear button should erase the search input in advanced DSL pop-up box (drop-down), fixed
    
    Signed-off-by: Pinal Shah <pi...@freestoneinfotech.com>
---
 dashboardv3/public/js/views/search/SearchDefaultLayoutView.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js b/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
index 468e83a..23dc560 100644
--- a/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
+++ b/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
@@ -101,6 +101,9 @@ define(["require", "backbone", "utils/Globals", "hbs!tmpl/search/SearchDefaultLa
                     var notifyObj = {
                         modal: true,
                         ok: function(argument) {
+                            if (Utils.getUrlState.getQueryParams().searchType === "dsl") {
+                                Globals.advanceSearchData = {};
+                            }
                             Utils.setUrl({
                                 url: '#!/search',
                                 mergeBrowserUrl: false,