You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ni...@apache.org on 2020/12/23 11:47:13 UTC
[atlas] branch master updated (433ae44 -> a88e912)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 433ae44 ATLAS-4060: Update hive_db model to add new attribute - 'managedLocation'
new a4b72a0 Atlas-4066: UI:- Fix Attribute Filter: 'is null' and 'is not null' does not work for user-defined properties.
new a88e912 ATLAS-4031 : Upgrade gremlin version to 3.4.8.
The 2 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:
.../public/js/views/search/QueryBuilderView.js | 11 +++++----
.../public/js/views/search/QueryBuilderView.js | 11 +++++----
graphdb/janus-hbase2/pom.xml | 24 +++++++++++++++++++
graphdb/janus/pom.xml | 28 ++++++++++++++++++++++
pom.xml | 2 +-
5 files changed, 65 insertions(+), 11 deletions(-)
[atlas] 01/02: Atlas-4066: UI:- Fix Attribute Filter: 'is null' and
'is not null' does not work for user-defined properties.
Posted by ni...@apache.org.
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
commit a4b72a00786a25e13a7453ccb199cc74cefd4aed
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Thu Dec 10 18:04:29 2020 +0530
Atlas-4066: UI:- Fix Attribute Filter: 'is null' and 'is not null' does not work for user-defined properties.
Signed-off-by: nixonrodrigues <ni...@apache.org>
---
dashboardv2/public/js/views/search/QueryBuilderView.js | 11 ++++++-----
dashboardv3/public/js/views/search/QueryBuilderView.js | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dashboardv2/public/js/views/search/QueryBuilderView.js b/dashboardv2/public/js/views/search/QueryBuilderView.js
index dd38cc7..49e9f20 100644
--- a/dashboardv2/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv2/public/js/views/search/QueryBuilderView.js
@@ -193,10 +193,10 @@ define(['require',
/* __customAttributes */
if (isSystemAttr && attrObj.name === "__customAttributes") {
obj["input"] = function(rule) {
- return rule.operator.nb_inputs ? that.getUserDefineInput() : null
+ return (rule && rule.operator && rule.operator.nb_inputs) ? that.getUserDefineInput() : null
}
obj["valueGetter"] = function(rule) {
- if (rule.operator.type === "contains") {
+ if (rule && rule.operator && rule.operator.type === "contains") {
var $el = rule.$el.find('.rule-value-container'),
key = $el.find("[data-type='key']").val(),
val = $el.find("[data-type='value']").val();
@@ -205,13 +205,15 @@ define(['require',
} else {
return new Error("Key & Value is Required");
}
+ } else {
+ return [] // in CommonviewFunction.js value is set to "" for object;
}
}
obj["valueSetter"] = function(rule) {
- if (!rule.$el.hasClass("user-define")) {
+ if (rule && !rule.$el.hasClass("user-define")) {
rule.$el.addClass("user-define");
}
- if (rule.value && !(rule.value instanceof Error)) {
+ if (rule && rule.value && rule.value.length && !(rule.value instanceof Error)) {
var $el = rule.$el.find('.rule-value-container'),
value = rule.value.split("=");
if (value) {
@@ -220,7 +222,6 @@ define(['require',
}
}
}
-
obj.operators = ['contains', 'is_null', 'not_null'];
return obj;
}
diff --git a/dashboardv3/public/js/views/search/QueryBuilderView.js b/dashboardv3/public/js/views/search/QueryBuilderView.js
index 9e14891..c9011f2 100644
--- a/dashboardv3/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv3/public/js/views/search/QueryBuilderView.js
@@ -193,10 +193,10 @@ define(['require',
/* __customAttributes */
if (isSystemAttr && attrObj.name === "__customAttributes") {
obj["input"] = function(rule) {
- return rule.operator.nb_inputs ? that.getUserDefineInput() : null
+ return (rule && rule.operator && rule.operator.nb_inputs) ? that.getUserDefineInput() : null
}
obj["valueGetter"] = function(rule) {
- if (rule.operator.type === "contains") {
+ if (rule && rule.operator && rule.operator.type === "contains") {
var $el = rule.$el.find('.rule-value-container'),
key = $el.find("[data-type='key']").val(),
val = $el.find("[data-type='value']").val();
@@ -205,13 +205,15 @@ define(['require',
} else {
return new Error("Key & Value is Required");
}
+ } else {
+ return [] // in CommonviewFunction.js value is set to "" for object;
}
}
obj["valueSetter"] = function(rule) {
- if (!rule.$el.hasClass("user-define")) {
+ if (rule && !rule.$el.hasClass("user-define")) {
rule.$el.addClass("user-define");
}
- if (rule.value && !(rule.value instanceof Error)) {
+ if (rule && rule.value && rule.value.length && !(rule.value instanceof Error)) {
var $el = rule.$el.find('.rule-value-container'),
value = rule.value.split("=");
if (value) {
@@ -220,7 +222,6 @@ define(['require',
}
}
}
-
obj.operators = ['contains', 'is_null', 'not_null'];
return obj;
}
[atlas] 02/02: ATLAS-4031 : Upgrade gremlin version to 3.4.8.
Posted by ni...@apache.org.
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
commit a88e912dcd910aa9d0602ffe17cb0e4807d32363
Author: chaitali borole <ch...@cloudera.com>
AuthorDate: Tue Dec 22 14:37:02 2020 +0530
ATLAS-4031 : Upgrade gremlin version to 3.4.8.
Signed-off-by: nixonrodrigues <ni...@apache.org>
---
graphdb/janus-hbase2/pom.xml | 24 ++++++++++++++++++++++++
graphdb/janus/pom.xml | 28 ++++++++++++++++++++++++++++
pom.xml | 2 +-
3 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/graphdb/janus-hbase2/pom.xml b/graphdb/janus-hbase2/pom.xml
index d14d150..5336b12 100644
--- a/graphdb/janus-hbase2/pom.xml
+++ b/graphdb/janus-hbase2/pom.xml
@@ -40,6 +40,30 @@
<groupId>com.codahale.metrics</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-shaded</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-groovy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-driver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph-gremlin</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index 9a4619f..836958d 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -79,6 +79,22 @@
<groupId>com.codahale.metrics</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-shaded</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-groovy</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-driver</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -229,6 +245,18 @@
</dependency>
<dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-groovy</artifactId>
+ <version>${tinkerpop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph-gremlin</artifactId>
+ <version>${tinkerpop.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index b1951f2..4387495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -745,7 +745,7 @@
<surefire.forkCount>2C</surefire.forkCount>
<surefire.version>2.18.1</surefire.version>
<testng.version>6.9.4</testng.version>
- <tinkerpop.version>3.4.6</tinkerpop.version>
+ <tinkerpop.version>3.4.8</tinkerpop.version>
<woodstox-core.version>5.0.3</woodstox-core.version>
<zookeeper.version>3.4.6</zookeeper.version>
</properties>