[atlas] 01/02: ATLAS-4379 : Atlas Filter changes for user inactivity on Atlas UI
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 fbbefce84eaa0e846faa01eb79b79a8f3184348f
Author: nixonrodrigues
AuthorDate: Mon Aug 23 17:27:18 2021 +0530
ATLAS-4379 : Atlas Filter changes for user inactivity on Atlas UI
---
.../java/org/apache/atlas/AtlasConfiguration.java | 4 +-
.../web/filters/AtlasAuthenticationFilter.java | 48 -
.../org/apache/atlas/web/filters/RestUtil.java | 108 +
.../apache/atlas/web/resources/AdminResource.java | 1 +
.../AtlasAuthenticationSuccessHandler.java | 16 ++-
5 files changed, 170 insertions(+), 7 deletions(-)
diff --git a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
index 2f2c8a5..fa519ef 100644
--- a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
+++ b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
@@ -80,7 +80,9 @@ public enum AtlasConfiguration {
DSL_EXECUTOR_TRAVERSAL("atlas.dsl.executor.traversal", true),
DSL_CACHED_TRANSLATOR("atlas.dsl.cached.translator", true),
DEBUG_METRICS_ENABLED("atlas.debug.metrics.enabled", false),
-TASKS_USE_ENABLED("atlas.tasks.enabled", true);
+TASKS_USE_ENABLED("atlas.tasks.enabled", true),
+SESSION_TIMEOUT_SECS("atlas.session.timeout.secs", 3600);
+
private static final Configuration APPLICATION_PROPERTIES;
diff --git
a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
index d9b1c82..b8d21b9 100644
---
a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
+++
b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java
@@ -19,6 +19,7 @@
package org.apache.atlas.web.filters;
import org.apache.atlas.ApplicationProperties;
+import org.apache.atlas.AtlasConfiguration;
import org.apache.atlas.security.SecurityProperties;
import org.apache.atlas.utils.AuthenticationUtil;
import org.apache.atlas.web.security.AtlasAuthenticationProvider;
@@ -73,6 +74,9 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.hadoop.security.authorize.AuthorizationException;
+import
org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
+
+import static org.apache.atlas.web.filters.RestUtil.constructForwardableURL;
/**
@@ -90,6 +94,7 @@ public class AtlasAuthenticationFilter extends
AuthenticationFilter {
private static final String[] DEFAULT_PROXY_USERS = new String[]
{ "knox" };
private static final String CONF_PROXYUSER_PREFIX =
"atlas.proxyuser";
protected static final ServletContext nullContext = new
NullServletContext();
+private static final String ORIGINAL_URL_QUERY_PARAM =
"originalUrl";
private Signer signer;
private SignerSecretProvider secretProvider;
@@ -102,8 +107,9 @@ public class AtlasAuthenticationFilter extends
AuthenticationFilter {
private Set atlasProxyUsers = new HashSet<>();
private HttpServlet optionsServlet;
private boolean supportTrustedProxy = false;
+private int sessionTimeout;
-
+private SecurityContextLogoutHandler logoutHandler;
public AtlasAuthenticationFilter() {
LOG.info("==> AtlasAuthenticationFilter()");
@@ -193,7 +199,7 @@ public class AtlasAuthenticationFilter extends
AuthenticationFilter {
optionsServlet = new HttpServlet() {
};
optionsServlet.init();
-
+logoutHandler = new SecurityContextLogoutHandler();
LOG.info("<== AtlasAuthenticationFilter.init(filterConfig={})",
filterConfig);
}
@@ -301,6 +307,10 @@ public class AtlasAuthenticationFilter extends
AuthenticationFilter {
LOG.debug(" AuthenticationFilterConfig: {}", ret);
+sessionTimeout = AtlasConfiguration.SESSION_TIMEOUT_SECS.getInt();
+if(sessionTimeout < 30){
+LOG.warn("AtlasAuthenticationFilter:: sessionTimeout is set low");
+}
supportKeyTabBrowserLogin =
configuration.getBoolean("atlas.authentication.method.kerberos.support.keytab.browser.login",
false);
supportTrustedProxy =
configuration.getBoolean("atlas.authentication.method.trustedproxy", true);
String agents =
configuration.getString(AtlasCSRFPreventionFilter.BROWSER_USER_AGENT_PARAM,
AtlasCSRFPreventionFilter.BROWSER_USER_AGENTS_DEFAULT);
@@ -332,6 +342,8 @@ public class AtlasAuthenticationFilter extends
AuthenticationFilter {
[atlas] branch master updated (097f50e -> 5deac62)
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 097f50e ATLAS-4403: Improve find entity by unique attributes logic - when multiple unique attributes exist for entity type new fbbefce ATLAS-4379 : Atlas Filter changes for user inactivity on Atlas UI new 5deac62 ATLAS-4378: UI - Implement session timeout on Atlas UI. 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: dashboardv2/public/css/scss/override.scss | 6 + .../js/external_lib/idealTimeout/store.min.js | 2 + dashboardv2/public/js/main.js | 27 +- dashboardv2/public/js/utils/Globals.js | 1 + dashboardv2/public/js/utils/Utils.js | 271 - dashboardv3/public/css/scss/override.scss | 6 + .../js/external_lib/idealTimeout/store.min.js | 2 + dashboardv3/public/js/main.js | 27 +- dashboardv3/public/js/utils/Globals.js | 1 + dashboardv3/public/js/utils/Utils.js | 267 +++- .../java/org/apache/atlas/AtlasConfiguration.java | 4 +- .../web/filters/AtlasAuthenticationFilter.java | 48 +++- .../org/apache/atlas/web/filters/RestUtil.java | 108 .../apache/atlas/web/resources/AdminResource.java | 1 + .../AtlasAuthenticationSuccessHandler.java | 16 +- 15 files changed, 774 insertions(+), 13 deletions(-) create mode 100644 dashboardv2/public/js/external_lib/idealTimeout/store.min.js create mode 100644 dashboardv3/public/js/external_lib/idealTimeout/store.min.js create mode 100644 webapp/src/main/java/org/apache/atlas/web/filters/RestUtil.java
[atlas] branch master updated: ATLAS-4387:UI: Propagated Classifications shows wrong count for entity type on Entity detail page, fixed
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 7917e54 ATLAS-4387:UI: Propagated Classifications shows wrong count
for entity type on Entity detail page, fixed
7917e54 is described below
commit 7917e548a9bf184fba9ed7b227bc153a7f11e949
Author: prasad pawar
AuthorDate: Thu Aug 5 18:36:08 2021 +0530
ATLAS-4387:UI: Propagated Classifications shows wrong count for entity type
on Entity detail page, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js | 2 +-
dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index d8e10cc..bb629b4 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -255,7 +255,7 @@ define(['require',
} else {
tags['propagated'].push(val);
if (tags.propagatedMap[typeName]) {
-tags.propagatedMap[typeName]["count"]
+= tags.propagatedMap[typeName]["count"];
+
tags.propagatedMap[typeName]["count"]++;
} else {
tags.propagatedMap[typeName] = val;
tags.propagatedMap[typeName]["count"]
= 1;
diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
index 8e0686b..471be3b 100644
--- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
@@ -259,7 +259,7 @@ define(['require',
} else {
tags['propagated'].push(val);
if (tags.propagatedMap[typeName]) {
-tags.propagatedMap[typeName]["count"]
+= tags.propagatedMap[typeName]["count"];
+
tags.propagatedMap[typeName]["count"]++;
} else {
tags.propagatedMap[typeName] = val;
tags.propagatedMap[typeName]["count"]
= 1;
[atlas] 03/03: ATLAS-4356:#1 UI: Unusual behaviour after clicking back button on business metadata, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 3626be1a72083c5e2ce6fdee6e3135a03d774a06
Author: prasad pawar
AuthorDate: Thu Jul 22 12:48:00 2021 +0530
ATLAS-4356:#1 UI: Unusual behaviour after clicking back button on business
metadata, fixed
Signed-off-by: nixonrodrigues
(cherry picked from commit b667943ff5217e8dc328dbd7f41c2c89199a78dd)
---
.../public/js/views/search/tree/BusinessMetadataTreeLayoutView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dashboardv3/public/js/views/search/tree/BusinessMetadataTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/BusinessMetadataTreeLayoutView.js
index f7a62fb..e93dd81 100644
--- a/dashboardv3/public/js/views/search/tree/BusinessMetadataTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/BusinessMetadataTreeLayoutView.js
@@ -145,7 +145,7 @@ define([
manualRender: function(options) {
var that = this;
_.extend(this, options);
-if (Utils.getUrlState.isAdministratorTab() && this.guid) {
+if (Utils.getUrlState.isBMDetailPage() && this.guid) {
this.ui.businessMetadataSearchTree.jstree(true).select_node(this.guid);
} else {
this.ui.businessMetadataSearchTree.jstree(true).deselect_all();
[atlas] 01/03: ATLAS-4360:UI: Misalignment of placeholder text in labels, enum attributes and classification fields in Chrome, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 21dc7f5713e113ea811e6714e299911724289693
Author: prasad pawar
AuthorDate: Wed Jul 14 12:06:23 2021 +0530
ATLAS-4360:UI: Misalignment of placeholder text in labels, enum attributes
and classification fields in Chrome, fixed
(cherry picked from commit e9c99739010b451638ad90773ca8d36e86fd2841)
---
dashboardv2/public/css/scss/override.scss | 4
dashboardv3/public/css/scss/override.scss | 4
2 files changed, 8 insertions(+)
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index c51a23c..fbe42ee 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -566,4 +566,8 @@ div.columnmanager-dropdown-container {
.tooltip-inner {
max-width: 250px;
+}
+
+.select2-container--default .select2-search--inline .select2-search__field {
+width: 100% !important;
}
\ No newline at end of file
diff --git a/dashboardv3/public/css/scss/override.scss
b/dashboardv3/public/css/scss/override.scss
index 280afd6..085d7e0 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -568,4 +568,8 @@ div.columnmanager-dropdown-container {
.tooltip-inner {
max-width: 250px;
+}
+
+.select2-container--default .select2-search--inline .select2-search__field {
+width: 100% !important;
}
\ No newline at end of file
[atlas] branch branch-2.0 updated (eac8ca2 -> 3626be1)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from eac8ca2 ATLAS-4364: Update Java Patch Id of ProcessNamePatch new 21dc7f5 ATLAS-4360:UI: Misalignment of placeholder text in labels, enum attributes and classification fields in Chrome, fixed new 32b8fe3 ATLAS-4359:UI: Misalignment in Searchweight tooltip text in business metadata,fixed new 3626be1 ATLAS-4356:#1 UI: Unusual behaviour after clicking back button on business metadata, 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/css/scss/override.scss | 11 ++- .../BusinessMetadataAttributeItemView_tmpl.html | 2 +- dashboardv3/public/css/scss/override.scss | 11 ++- .../BusinessMetadataAttributeItemView_tmpl.html | 2 +- .../js/views/search/tree/BusinessMetadataTreeLayoutView.js| 2 +- 5 files changed, 23 insertions(+), 5 deletions(-)
[atlas] 02/03: ATLAS-4359:UI: Misalignment in Searchweight tooltip text in business metadata, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 32b8fe3cd5a3582d5a02bbb6a038ca2f60dbb7c6
Author: prasad pawar
AuthorDate: Wed Jul 14 18:17:07 2021 +0530
ATLAS-4359:UI: Misalignment in Searchweight tooltip text in business
metadata,fixed
(cherry picked from commit 9a5c5c5a39bbc5167127e25bf243c8cf93d81971)
---
dashboardv2/public/css/scss/override.scss | 13 +
.../BusinessMetadataAttributeItemView_tmpl.html | 2 +-
dashboardv3/public/css/scss/override.scss | 13 +
.../BusinessMetadataAttributeItemView_tmpl.html | 2 +-
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index fbe42ee..c24b0c6 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -564,10 +564,15 @@ div.columnmanager-dropdown-container {
padding-top: 20px;
}
-.tooltip-inner {
-max-width: 250px;
-}
-
.select2-container--default .select2-search--inline .select2-search__field {
width: 100% !important;
+}
+
+.tooltip-inner>div {
+max-width: 250px;
+text-align: left;
+
+ul {
+list-style: disc;
+}
}
\ No newline at end of file
diff --git
a/dashboardv2/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
b/dashboardv2/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
index 55b4969..3d316f6 100644
---
a/dashboardv2/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
+++
b/dashboardv2/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
@@ -62,7 +62,7 @@
-
+
diff --git a/dashboardv3/public/css/scss/override.scss
b/dashboardv3/public/css/scss/override.scss
index 085d7e0..c1841eb 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -566,10 +566,15 @@ div.columnmanager-dropdown-container {
padding-top: 20px;
}
-.tooltip-inner {
-max-width: 250px;
-}
-
.select2-container--default .select2-search--inline .select2-search__field {
width: 100% !important;
+}
+
+.tooltip-inner>div {
+max-width: 250px;
+text-align: left;
+
+ul {
+list-style: disc;
+}
}
\ No newline at end of file
diff --git
a/dashboardv3/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
b/dashboardv3/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
index 55b4969..3d316f6 100644
---
a/dashboardv3/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
+++
b/dashboardv3/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
@@ -62,7 +62,7 @@
-
+
[atlas] 03/03: ATLAS-4356:#1 UI: Unusual behaviour after clicking back button on business metadata, fixed
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 b667943ff5217e8dc328dbd7f41c2c89199a78dd
Author: prasad pawar
AuthorDate: Thu Jul 22 12:48:00 2021 +0530
ATLAS-4356:#1 UI: Unusual behaviour after clicking back button on business
metadata, fixed
Signed-off-by: nixonrodrigues
---
.../public/js/views/search/tree/BusinessMetadataTreeLayoutView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dashboardv3/public/js/views/search/tree/BusinessMetadataTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/BusinessMetadataTreeLayoutView.js
index f7a62fb..e93dd81 100644
--- a/dashboardv3/public/js/views/search/tree/BusinessMetadataTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/BusinessMetadataTreeLayoutView.js
@@ -145,7 +145,7 @@ define([
manualRender: function(options) {
var that = this;
_.extend(this, options);
-if (Utils.getUrlState.isAdministratorTab() && this.guid) {
+if (Utils.getUrlState.isBMDetailPage() && this.guid) {
this.ui.businessMetadataSearchTree.jstree(true).select_node(this.guid);
} else {
this.ui.businessMetadataSearchTree.jstree(true).deselect_all();
[atlas] branch master updated (2170672 -> b667943)
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 2170672 ATLAS-4364: Update Java Patch Id of ProcessNamePatch new e9c9973 ATLAS-4360:UI: Misalignment of placeholder text in labels, enum attributes and classification fields in Chrome, fixed new 9a5c5c5 ATLAS-4359:UI: Misalignment in Searchweight tooltip text in business metadata,fixed new b667943 ATLAS-4356:#1 UI: Unusual behaviour after clicking back button on business metadata, 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/css/scss/override.scss | 11 ++- .../BusinessMetadataAttributeItemView_tmpl.html | 2 +- dashboardv3/public/css/scss/override.scss | 11 ++- .../BusinessMetadataAttributeItemView_tmpl.html | 2 +- .../js/views/search/tree/BusinessMetadataTreeLayoutView.js| 2 +- 5 files changed, 23 insertions(+), 5 deletions(-)
[atlas] 02/03: ATLAS-4359:UI: Misalignment in Searchweight tooltip text in business metadata, fixed
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 9a5c5c5a39bbc5167127e25bf243c8cf93d81971
Author: prasad pawar
AuthorDate: Wed Jul 14 18:17:07 2021 +0530
ATLAS-4359:UI: Misalignment in Searchweight tooltip text in business
metadata,fixed
---
dashboardv2/public/css/scss/override.scss | 13 +
.../BusinessMetadataAttributeItemView_tmpl.html | 2 +-
dashboardv3/public/css/scss/override.scss | 13 +
.../BusinessMetadataAttributeItemView_tmpl.html | 2 +-
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index fbe42ee..c24b0c6 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -564,10 +564,15 @@ div.columnmanager-dropdown-container {
padding-top: 20px;
}
-.tooltip-inner {
-max-width: 250px;
-}
-
.select2-container--default .select2-search--inline .select2-search__field {
width: 100% !important;
+}
+
+.tooltip-inner>div {
+max-width: 250px;
+text-align: left;
+
+ul {
+list-style: disc;
+}
}
\ No newline at end of file
diff --git
a/dashboardv2/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
b/dashboardv2/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
index 55b4969..3d316f6 100644
---
a/dashboardv2/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
+++
b/dashboardv2/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
@@ -62,7 +62,7 @@
-
+
diff --git a/dashboardv3/public/css/scss/override.scss
b/dashboardv3/public/css/scss/override.scss
index 085d7e0..c1841eb 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -566,10 +566,15 @@ div.columnmanager-dropdown-container {
padding-top: 20px;
}
-.tooltip-inner {
-max-width: 250px;
-}
-
.select2-container--default .select2-search--inline .select2-search__field {
width: 100% !important;
+}
+
+.tooltip-inner>div {
+max-width: 250px;
+text-align: left;
+
+ul {
+list-style: disc;
+}
}
\ No newline at end of file
diff --git
a/dashboardv3/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
b/dashboardv3/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
index 55b4969..3d316f6 100644
---
a/dashboardv3/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
+++
b/dashboardv3/public/js/templates/business_metadata/BusinessMetadataAttributeItemView_tmpl.html
@@ -62,7 +62,7 @@
-
+
[atlas] 01/03: ATLAS-4360:UI: Misalignment of placeholder text in labels, enum attributes and classification fields in Chrome, fixed
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 e9c99739010b451638ad90773ca8d36e86fd2841
Author: prasad pawar
AuthorDate: Wed Jul 14 12:06:23 2021 +0530
ATLAS-4360:UI: Misalignment of placeholder text in labels, enum attributes
and classification fields in Chrome, fixed
---
dashboardv2/public/css/scss/override.scss | 4
dashboardv3/public/css/scss/override.scss | 4
2 files changed, 8 insertions(+)
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index c51a23c..fbe42ee 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -566,4 +566,8 @@ div.columnmanager-dropdown-container {
.tooltip-inner {
max-width: 250px;
+}
+
+.select2-container--default .select2-search--inline .select2-search__field {
+width: 100% !important;
}
\ No newline at end of file
diff --git a/dashboardv3/public/css/scss/override.scss
b/dashboardv3/public/css/scss/override.scss
index 280afd6..085d7e0 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -568,4 +568,8 @@ div.columnmanager-dropdown-container {
.tooltip-inner {
max-width: 250px;
+}
+
+.select2-container--default .select2-search--inline .select2-search__field {
+width: 100% !important;
}
\ No newline at end of file
[atlas] branch branch-2.0 updated: ATLAS-4354: atlas import-hive.sh fails with java.lang.AbstractMethodError
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 32e1147 ATLAS-4354: atlas import-hive.sh fails with
java.lang.AbstractMethodError
32e1147 is described below
commit 32e11478f8cbedf1800e27b286519af6250a2e59
Author: Radhika Kundam
AuthorDate: Mon Jul 12 22:11:14 2021 -0700
ATLAS-4354: atlas import-hive.sh fails with java.lang.AbstractMethodError
Signed-off-by: nixonrodrigues
(cherry picked from commit c1dc84cdeeb1b5c3a53f2bec01ae138e5f578dd1)
---
addons/hive-bridge/src/bin/import-hive.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/addons/hive-bridge/src/bin/import-hive.sh
b/addons/hive-bridge/src/bin/import-hive.sh
index 405497b..693a79b 100755
--- a/addons/hive-bridge/src/bin/import-hive.sh
+++ b/addons/hive-bridge/src/bin/import-hive.sh
@@ -91,8 +91,11 @@ if [ -z "$HIVE_HOME" ]; then
fi
HIVE_CP="${HIVE_CONF}"
+# Multiple jars in HIVE_CP_EXCLUDE_LIST can be added using "\|" separator
+# Ex: HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api\|jersey-multipart"
+HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api"
-for i in "${HIVE_HOME}/lib/"*.jar; do
+for i in $(find "${HIVE_HOME}/lib/" -name "*.jar" | grep -v
"$HIVE_CP_EXCLUDE_LIST"); do
HIVE_CP="${HIVE_CP}:$i"
done
[atlas] branch master updated: ATLAS-4354: atlas import-hive.sh fails with java.lang.AbstractMethodError
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 c1dc84c ATLAS-4354: atlas import-hive.sh fails with
java.lang.AbstractMethodError
c1dc84c is described below
commit c1dc84cdeeb1b5c3a53f2bec01ae138e5f578dd1
Author: Radhika Kundam
AuthorDate: Mon Jul 12 22:11:14 2021 -0700
ATLAS-4354: atlas import-hive.sh fails with java.lang.AbstractMethodError
Signed-off-by: nixonrodrigues
---
addons/hive-bridge/src/bin/import-hive.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/addons/hive-bridge/src/bin/import-hive.sh
b/addons/hive-bridge/src/bin/import-hive.sh
index 405497b..693a79b 100755
--- a/addons/hive-bridge/src/bin/import-hive.sh
+++ b/addons/hive-bridge/src/bin/import-hive.sh
@@ -91,8 +91,11 @@ if [ -z "$HIVE_HOME" ]; then
fi
HIVE_CP="${HIVE_CONF}"
+# Multiple jars in HIVE_CP_EXCLUDE_LIST can be added using "\|" separator
+# Ex: HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api\|jersey-multipart"
+HIVE_CP_EXCLUDE_LIST="javax.ws.rs-api"
-for i in "${HIVE_HOME}/lib/"*.jar; do
+for i in $(find "${HIVE_HOME}/lib/" -name "*.jar" | grep -v
"$HIVE_CP_EXCLUDE_LIST"); do
HIVE_CP="${HIVE_CP}:$i"
done
[atlas] branch branch-2.0 updated: ATLAS-4345:UI: Lineage issues for when entities are greater than 9k in a given lineage. fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new fdf21bf ATLAS-4345:UI: Lineage issues for when entities are greater
than 9k in a given lineage. fixed
fdf21bf is described below
commit fdf21bf7994be7a8b99157fc961bbd86f6390f65
Author: prasad pawar
AuthorDate: Mon Jul 5 15:36:08 2021 +0530
ATLAS-4345:UI: Lineage issues for when entities are greater than 9k in a
given lineage. fixed
Signed-off-by: nixonrodrigues
(cherry picked from commit 475a89b30864bd95909837a2b3480779fc7ee5e2)
---
dashboardv2/public/js/views/graph/LineageLayoutView.js | 17 +
dashboardv3/public/js/views/graph/LineageLayoutView.js | 18 ++
2 files changed, 35 insertions(+)
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js
b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index 5ad657e..b106ee6 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -226,6 +226,13 @@ define(['require',
this.labelFullText = false;
},
onClickSaveSvg: function(e, a) {
+var that = this;
+if (that.lineageRelationshipLength >= 1000) {
+Utils.notifyInfo({
+content: "There was an error in downloading lineage:
Lineage exceeds display parameters!"
+});
+return;
+}
this.LineageHelperRef.exportLineage();
},
onClickZoomIn: function() {
@@ -254,6 +261,16 @@ define(['require',
return;
}
data["legends"] = options ? options.legends : true;
+// show only main part of lineage current entity is at
bottom, so reverse is done
+var relationsReverse = data.relations ?
data.relations.reverse() : null,
+lineageMaxRelationCount = 9000;
+if (relationsReverse.length > lineageMaxRelationCount)
{
+data.relations =
relationsReverse.splice(relationsReverse.length - lineageMaxRelationCount,
relationsReverse.length - 1);
+Utils.notifyInfo({
+content: "Lineage exceeds display parameters
and hence only upto 9000 relationships from this lineage can be displayed"
+});
+}
+that.lineageRelationshipLength = data.relations.length;
that.createGraph(data);
that.renderLineageTypeSearch(data);
},
diff --git a/dashboardv3/public/js/views/graph/LineageLayoutView.js
b/dashboardv3/public/js/views/graph/LineageLayoutView.js
index 954d9af..b106ee6 100644
--- a/dashboardv3/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv3/public/js/views/graph/LineageLayoutView.js
@@ -226,6 +226,13 @@ define(['require',
this.labelFullText = false;
},
onClickSaveSvg: function(e, a) {
+var that = this;
+if (that.lineageRelationshipLength >= 1000) {
+Utils.notifyInfo({
+content: "There was an error in downloading lineage:
Lineage exceeds display parameters!"
+});
+return;
+}
this.LineageHelperRef.exportLineage();
},
onClickZoomIn: function() {
@@ -254,6 +261,16 @@ define(['require',
return;
}
data["legends"] = options ? options.legends : true;
+// show only main part of lineage current entity is at
bottom, so reverse is done
+var relationsReverse = data.relations ?
data.relations.reverse() : null,
+lineageMaxRelationCount = 9000;
+if (relationsReverse.length > lineageMaxRelationCount)
{
+data.relations =
relationsReverse.splice(relationsReverse.length - lineageMaxRelationCount,
relationsReverse.length - 1);
+Utils.notifyInfo({
+content: "Lineage exceeds display parameters
and hence only upto 9000 relationships from this lineage can be displayed"
+});
+}
+that.lineageRelationshipLength = data.relations.length;
that.createGraph(data);
that.renderLin
[atlas] branch master updated: ATLAS-4345:UI: Lineage issues for when entities are greater than 9k in a given lineage. fixed
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 475a89b ATLAS-4345:UI: Lineage issues for when entities are greater
than 9k in a given lineage. fixed
475a89b is described below
commit 475a89b30864bd95909837a2b3480779fc7ee5e2
Author: prasad pawar
AuthorDate: Mon Jul 5 15:36:08 2021 +0530
ATLAS-4345:UI: Lineage issues for when entities are greater than 9k in a
given lineage. fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/graph/LineageLayoutView.js | 17 +
dashboardv3/public/js/views/graph/LineageLayoutView.js | 18 ++
2 files changed, 35 insertions(+)
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js
b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index 5ad657e..b106ee6 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -226,6 +226,13 @@ define(['require',
this.labelFullText = false;
},
onClickSaveSvg: function(e, a) {
+var that = this;
+if (that.lineageRelationshipLength >= 1000) {
+Utils.notifyInfo({
+content: "There was an error in downloading lineage:
Lineage exceeds display parameters!"
+});
+return;
+}
this.LineageHelperRef.exportLineage();
},
onClickZoomIn: function() {
@@ -254,6 +261,16 @@ define(['require',
return;
}
data["legends"] = options ? options.legends : true;
+// show only main part of lineage current entity is at
bottom, so reverse is done
+var relationsReverse = data.relations ?
data.relations.reverse() : null,
+lineageMaxRelationCount = 9000;
+if (relationsReverse.length > lineageMaxRelationCount)
{
+data.relations =
relationsReverse.splice(relationsReverse.length - lineageMaxRelationCount,
relationsReverse.length - 1);
+Utils.notifyInfo({
+content: "Lineage exceeds display parameters
and hence only upto 9000 relationships from this lineage can be displayed"
+});
+}
+that.lineageRelationshipLength = data.relations.length;
that.createGraph(data);
that.renderLineageTypeSearch(data);
},
diff --git a/dashboardv3/public/js/views/graph/LineageLayoutView.js
b/dashboardv3/public/js/views/graph/LineageLayoutView.js
index 954d9af..b106ee6 100644
--- a/dashboardv3/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv3/public/js/views/graph/LineageLayoutView.js
@@ -226,6 +226,13 @@ define(['require',
this.labelFullText = false;
},
onClickSaveSvg: function(e, a) {
+var that = this;
+if (that.lineageRelationshipLength >= 1000) {
+Utils.notifyInfo({
+content: "There was an error in downloading lineage:
Lineage exceeds display parameters!"
+});
+return;
+}
this.LineageHelperRef.exportLineage();
},
onClickZoomIn: function() {
@@ -254,6 +261,16 @@ define(['require',
return;
}
data["legends"] = options ? options.legends : true;
+// show only main part of lineage current entity is at
bottom, so reverse is done
+var relationsReverse = data.relations ?
data.relations.reverse() : null,
+lineageMaxRelationCount = 9000;
+if (relationsReverse.length > lineageMaxRelationCount)
{
+data.relations =
relationsReverse.splice(relationsReverse.length - lineageMaxRelationCount,
relationsReverse.length - 1);
+Utils.notifyInfo({
+content: "Lineage exceeds display parameters
and hence only upto 9000 relationships from this lineage can be displayed"
+});
+}
+that.lineageRelationshipLength = data.relations.length;
that.createGraph(data);
that.renderLineageTypeSearch(data);
},
@@ -269,6 +286,7 @@ define(['r
[atlas] branch branch-2.0 updated: ATLAS-4286:UI - User is taken to incorrect page as you go one page back after reaching page limit.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new b67746d ATLAS-4286:UI - User is taken to incorrect page as you go
one page back after reaching page limit.
b67746d is described below
commit b67746ddcbcdc818eefcae7c555858facdaa004b
Author: prasad pawar
AuthorDate: Mon Jun 21 14:15:13 2021 +0530
ATLAS-4286:UI - User is taken to incorrect page as you go one page back
after reaching page limit.
(cherry picked from commit 2f6f20474bc08c9706b26c0a09d6092b69e8590f)
---
dashboardv2/public/js/utils/TableLayout.js | 49 +++---
dashboardv3/public/js/utils/TableLayout.js | 49 +++---
2 files changed, 48 insertions(+), 50 deletions(-)
diff --git a/dashboardv2/public/js/utils/TableLayout.js
b/dashboardv2/public/js/utils/TableLayout.js
index 174d443..8322029 100644
--- a/dashboardv2/public/js/utils/TableLayout.js
+++ b/dashboardv2/public/js/utils/TableLayout.js
@@ -425,31 +425,6 @@ define(['require',
dataLength = this.collection.length,
goToPage = this.ui.gotoPage.val();
-if (!dataLength && this.offset >= this.limit && ((options &&
options.next) || goToPage) && (options && !options.fromUrl)) {
-/* User clicks on next button and server returns
-empty response then disabled the next button without
rendering table*/
-
-var pageNumber = this.activePage + 1;
-if (goToPage) {
-pageNumber = goToPage;
-this.offset = (this.activePage - 1) * this.limit;
-} else {
-this.ui.nextData.attr('disabled', true);
-this.offset = this.offset - this.limit;
-}
-if (this.value) {
-this.value.pageOffset = this.offset;
-if (this.triggerUrl) {
-this.triggerUrl();
-}
-}
-Utils.notifyInfo({
-html: true,
-content: Messages.search.noRecordForPage + '' +
Utils.getNumberSuffix({ number: pageNumber, sup: true }) + ' page'
-});
-return;
-}
-
/*Next button check.
It's outside of Previous button else condition
because when user comes from 2 page to 1 page than we need to
check next button.*/
@@ -492,6 +467,30 @@ define(['require',
this.ui.activePage.attr('title', "Page " + this.activePage);
this.ui.activePage.text(this.activePage);
this.ui.showPage.val(this.limit).trigger('change', {
"skipViewChange": true });
+
+if (!dataLength && this.offset >= this.limit && ((options &&
options.next) || goToPage) && (options && !options.fromUrl)) {
+/* User clicks on next button and server returns
+empty response then disabled the next button without
rendering table*/
+
+var pageNumber = this.activePage;
+if (goToPage) {
+pageNumber = goToPage;
+this.offset = (this.activePage - 1) * this.limit;
+} else {
+this.ui.nextData.attr('disabled', true);
+}
+if (this.value) {
+this.value.pageOffset = this.offset;
+if (this.triggerUrl) {
+this.triggerUrl();
+}
+}
+Utils.notifyInfo({
+html: true,
+content: Messages.search.noRecordForPage + '' +
Utils.getNumberSuffix({ number: pageNumber, sup: true }) + ' page'
+});
+return;
+}
},
/**
diff --git a/dashboardv3/public/js/utils/TableLayout.js
b/dashboardv3/public/js/utils/TableLayout.js
index 174d443..8322029 100644
--- a/dashboardv3/public/js/utils/TableLayout.js
+++ b/dashboardv3/public/js/utils/TableLayout.js
@@ -425,31 +425,6 @@ define(['require',
dataLength = this.collection.length,
goToPage = this.ui.gotoPage.val();
-if (!dataLength && this.offset >= this.limit && ((options &&
options.next) || goToPage) && (options && !options.fromUrl)) {
-/* User clicks on next button and server returns
-
[atlas] branch master updated: ATLAS-4286:UI - User is taken to incorrect page as you go one page back after reaching page limit.
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 2f6f204 ATLAS-4286:UI - User is taken to incorrect page as you go
one page back after reaching page limit.
2f6f204 is described below
commit 2f6f20474bc08c9706b26c0a09d6092b69e8590f
Author: prasad pawar
AuthorDate: Mon Jun 21 14:15:13 2021 +0530
ATLAS-4286:UI - User is taken to incorrect page as you go one page back
after reaching page limit.
---
dashboardv2/public/js/utils/TableLayout.js | 49 +++---
dashboardv3/public/js/utils/TableLayout.js | 49 +++---
2 files changed, 48 insertions(+), 50 deletions(-)
diff --git a/dashboardv2/public/js/utils/TableLayout.js
b/dashboardv2/public/js/utils/TableLayout.js
index 174d443..8322029 100644
--- a/dashboardv2/public/js/utils/TableLayout.js
+++ b/dashboardv2/public/js/utils/TableLayout.js
@@ -425,31 +425,6 @@ define(['require',
dataLength = this.collection.length,
goToPage = this.ui.gotoPage.val();
-if (!dataLength && this.offset >= this.limit && ((options &&
options.next) || goToPage) && (options && !options.fromUrl)) {
-/* User clicks on next button and server returns
-empty response then disabled the next button without
rendering table*/
-
-var pageNumber = this.activePage + 1;
-if (goToPage) {
-pageNumber = goToPage;
-this.offset = (this.activePage - 1) * this.limit;
-} else {
-this.ui.nextData.attr('disabled', true);
-this.offset = this.offset - this.limit;
-}
-if (this.value) {
-this.value.pageOffset = this.offset;
-if (this.triggerUrl) {
-this.triggerUrl();
-}
-}
-Utils.notifyInfo({
-html: true,
-content: Messages.search.noRecordForPage + '' +
Utils.getNumberSuffix({ number: pageNumber, sup: true }) + ' page'
-});
-return;
-}
-
/*Next button check.
It's outside of Previous button else condition
because when user comes from 2 page to 1 page than we need to
check next button.*/
@@ -492,6 +467,30 @@ define(['require',
this.ui.activePage.attr('title', "Page " + this.activePage);
this.ui.activePage.text(this.activePage);
this.ui.showPage.val(this.limit).trigger('change', {
"skipViewChange": true });
+
+if (!dataLength && this.offset >= this.limit && ((options &&
options.next) || goToPage) && (options && !options.fromUrl)) {
+/* User clicks on next button and server returns
+empty response then disabled the next button without
rendering table*/
+
+var pageNumber = this.activePage;
+if (goToPage) {
+pageNumber = goToPage;
+this.offset = (this.activePage - 1) * this.limit;
+} else {
+this.ui.nextData.attr('disabled', true);
+}
+if (this.value) {
+this.value.pageOffset = this.offset;
+if (this.triggerUrl) {
+this.triggerUrl();
+}
+}
+Utils.notifyInfo({
+html: true,
+content: Messages.search.noRecordForPage + '' +
Utils.getNumberSuffix({ number: pageNumber, sup: true }) + ' page'
+});
+return;
+}
},
/**
diff --git a/dashboardv3/public/js/utils/TableLayout.js
b/dashboardv3/public/js/utils/TableLayout.js
index 174d443..8322029 100644
--- a/dashboardv3/public/js/utils/TableLayout.js
+++ b/dashboardv3/public/js/utils/TableLayout.js
@@ -425,31 +425,6 @@ define(['require',
dataLength = this.collection.length,
goToPage = this.ui.gotoPage.val();
-if (!dataLength && this.offset >= this.limit && ((options &&
options.next) || goToPage) && (options && !options.fromUrl)) {
-/* User clicks on next button and server returns
-empty response then disabled the next button without
rendering tab
[atlas] 02/02: ATLAS-4317 : Upgrade curator jar version to 4.3.0
This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git commit f694d4d078ad878069132d4e5018348ae96743b0 Author: chaitali borole AuthorDate: Tue Jun 1 15:03:52 2021 +0530 ATLAS-4317 : Upgrade curator jar version to 4.3.0 (cherry picked from commit fa07f535f2b1f9315e8a7b75d9744c22fb9f) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b7ca20..f23d13c 100644 --- a/pom.xml +++ b/pom.xml @@ -683,7 +683,7 @@ 2.6 1.1.3 1.6 -4.0.1 +4.3.0 1.8 3.2.2 6.8.3
[atlas] branch branch-2.0 updated (b5622af -> f694d4d)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from b5622af ATLAS-3923 : fix NullPointException in HBaseBasedAuditRepository.listEventsV2 (#108) new 3a401b9 ATLAS-4316:UI: When lineage contains shell entities, the image couldn't be downloaded. new f694d4d ATLAS-4317 : Upgrade curator jar version to 4.3.0 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: dashboardv2/public/img/entity-icon/hourglass.svg | 3 +++ dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js | 2 +- dashboardv3/public/img/entity-icon/hourglass.svg | 3 +++ dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js | 2 +- pom.xml| 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 dashboardv2/public/img/entity-icon/hourglass.svg create mode 100644 dashboardv3/public/img/entity-icon/hourglass.svg
[atlas] 01/02: ATLAS-4316:UI: When lineage contains shell entities, the image couldn't be downloaded.
This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git commit 3a401b92c048aca600372a9ebc1e5f387cb9110d Author: prasad pawar AuthorDate: Tue Jun 22 11:34:02 2021 +0530 ATLAS-4316:UI: When lineage contains shell entities, the image couldn't be downloaded. Signed-off-by: nixonrodrigues (cherry picked from commit 244c5d519432754841709687aa008e544822dae3) --- dashboardv2/public/img/entity-icon/hourglass.svg | 3 +++ dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js | 2 +- dashboardv3/public/img/entity-icon/hourglass.svg | 3 +++ dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js | 2 +- pom.xml| 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dashboardv2/public/img/entity-icon/hourglass.svg b/dashboardv2/public/img/entity-icon/hourglass.svg new file mode 100644 index 000..aad4978 --- /dev/null +++ b/dashboardv2/public/img/entity-icon/hourglass.svg @@ -0,0 +1,3 @@ +http://www.w3.org/2000/svg;> +http://www.w3.org/2000/svg;> + **/docz-lib/** **/.docz/** +**/*.svg
[atlas] branch master updated (b032339 -> fa04444)
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 b032339 ATLAS-3923 : fix NullPointException in HBaseBasedAuditRepository.listEventsV2 (#108) new 244c5d5 ATLAS-4316:UI: When lineage contains shell entities, the image couldn't be downloaded. new fa0 ATLAS-4317 : Upgrade curator jar version to 4.3.0 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: dashboardv2/public/img/entity-icon/hourglass.svg | 3 +++ dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js | 2 +- dashboardv3/public/img/entity-icon/hourglass.svg | 3 +++ dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js | 2 +- pom.xml| 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 dashboardv2/public/img/entity-icon/hourglass.svg create mode 100644 dashboardv3/public/img/entity-icon/hourglass.svg
[atlas] 02/02: ATLAS-4317 : Upgrade curator jar version to 4.3.0
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 fa07f535f2b1f9315e8a7b75d9744c22fb9f Author: chaitali borole AuthorDate: Tue Jun 1 15:03:52 2021 +0530 ATLAS-4317 : Upgrade curator jar version to 4.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cae68dd..19db431 100644 --- a/pom.xml +++ b/pom.xml @@ -694,7 +694,7 @@ 2.6 1.1.3 1.6 -4.0.1 +4.3.0 1.8 3.2.2 6.8.3
[atlas] 01/02: ATLAS-4316:UI: When lineage contains shell entities, the image couldn't be downloaded.
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 244c5d519432754841709687aa008e544822dae3 Author: prasad pawar AuthorDate: Tue Jun 22 11:34:02 2021 +0530 ATLAS-4316:UI: When lineage contains shell entities, the image couldn't be downloaded. Signed-off-by: nixonrodrigues --- dashboardv2/public/img/entity-icon/hourglass.svg | 3 +++ dashboardv2/public/js/external_lib/atlas-lineage/dist/index.js | 2 +- dashboardv3/public/img/entity-icon/hourglass.svg | 3 +++ dashboardv3/public/js/external_lib/atlas-lineage/dist/index.js | 2 +- pom.xml| 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dashboardv2/public/img/entity-icon/hourglass.svg b/dashboardv2/public/img/entity-icon/hourglass.svg new file mode 100644 index 000..aad4978 --- /dev/null +++ b/dashboardv2/public/img/entity-icon/hourglass.svg @@ -0,0 +1,3 @@ +http://www.w3.org/2000/svg;> +http://www.w3.org/2000/svg;> + **/docz-lib/** **/.docz/** +**/*.svg
[atlas] branch branch-2.0 updated: ATLAS-3923 : fix NullPointException in HBaseBasedAuditRepository.listEventsV2 (#108)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new b5622af ATLAS-3923 : fix NullPointException in
HBaseBasedAuditRepository.listEventsV2 (#108)
b5622af is described below
commit b5622afed500ae7b3f8990eff72ee79caec2d39c
Author: zyyBjtu <20431...@qq.com>
AuthorDate: Wed Jun 16 22:00:18 2021 +0800
ATLAS-3923 : fix NullPointException in
HBaseBasedAuditRepository.listEventsV2 (#108)
Co-authored-by: zhangyy2255
(cherry picked from commit b0323398ff5e554b3818f18581651b140535ca88)
---
.../org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
b/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
index b061761..a99f9b3 100644
---
a/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
+++
b/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
@@ -232,7 +232,7 @@ public class HBaseBasedAuditRepository extends
AbstractStorageBasedAuditReposito
@Override
public List listEventsV2(String entityId,
EntityAuditActionV2 auditAction, String startKey, short maxResultCount) throws
AtlasBaseException {
if (LOG.isDebugEnabled()) {
-LOG.debug("Listing events for entity id {}, operation {}, starting
key{}, maximum result count {}", entityId, auditAction.toString(), startKey,
maxResultCount);
+LOG.debug("Listing events for entity id {}, operation {}, starting
key{}, maximum result count {}", entityId, auditAction, startKey,
maxResultCount);
}
AtlasPerfMetrics.MetricRecorder metric =
RequestContext.get().startMetricRecord("listSortedEventsV2");
Table table = null;
[atlas] branch master updated: ATLAS-3923 : fix NullPointException in HBaseBasedAuditRepository.listEventsV2 (#108)
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 b032339 ATLAS-3923 : fix NullPointException in
HBaseBasedAuditRepository.listEventsV2 (#108)
b032339 is described below
commit b0323398ff5e554b3818f18581651b140535ca88
Author: zyyBjtu <20431...@qq.com>
AuthorDate: Wed Jun 16 22:00:18 2021 +0800
ATLAS-3923 : fix NullPointException in
HBaseBasedAuditRepository.listEventsV2 (#108)
Co-authored-by: zhangyy2255
---
.../org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
b/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
index b061761..a99f9b3 100644
---
a/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
+++
b/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
@@ -232,7 +232,7 @@ public class HBaseBasedAuditRepository extends
AbstractStorageBasedAuditReposito
@Override
public List listEventsV2(String entityId,
EntityAuditActionV2 auditAction, String startKey, short maxResultCount) throws
AtlasBaseException {
if (LOG.isDebugEnabled()) {
-LOG.debug("Listing events for entity id {}, operation {}, starting
key{}, maximum result count {}", entityId, auditAction.toString(), startKey,
maxResultCount);
+LOG.debug("Listing events for entity id {}, operation {}, starting
key{}, maximum result count {}", entityId, auditAction, startKey,
maxResultCount);
}
AtlasPerfMetrics.MetricRecorder metric =
RequestContext.get().startMetricRecord("listSortedEventsV2");
Table table = null;
[atlas] branch branch-2.0 updated: ATLAS-4337: UI: Add entity icons for all the Kafka types.
This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git The following commit(s) were added to refs/heads/branch-2.0 by this push: new 92e3fef ATLAS-4337: UI: Add entity icons for all the Kafka types. 92e3fef is described below commit 92e3fefe47dea55898b85f3dab354c4830a21b7d Author: prasad pawar AuthorDate: Tue Jun 15 16:45:44 2021 +0530 ATLAS-4337: UI: Add entity icons for all the Kafka types. Signed-off-by: nixonrodrigues (cherry picked from commit ddf3bcff29b903f1efc6671285ddf8f3cc10c7c3) --- .../img/entity-icon/disabled/kafka_consumer.png | Bin 0 -> 4038 bytes .../img/entity-icon/disabled/kafka_consumer_group.png | Bin 0 -> 4181 bytes .../entity-icon/disabled/kafka_consumer_lineage.png | Bin 0 -> 5299 bytes .../img/entity-icon/disabled/kafka_producer.png | Bin 0 -> 3737 bytes .../entity-icon/disabled/kafka_producer_lineage.png | Bin 0 -> 5108 bytes .../public/img/entity-icon/disabled/kafka_topic.png | Bin 6957 -> 3689 bytes dashboardv2/public/img/entity-icon/kafka_consumer.png | Bin 0 -> 4675 bytes .../public/img/entity-icon/kafka_consumer_group.png | Bin 0 -> 4835 bytes .../public/img/entity-icon/kafka_consumer_lineage.png | Bin 0 -> 7103 bytes dashboardv2/public/img/entity-icon/kafka_producer.png | Bin 0 -> 4188 bytes .../public/img/entity-icon/kafka_producer_lineage.png | Bin 0 -> 6749 bytes dashboardv2/public/img/entity-icon/kafka_topic.png| Bin 9659 -> 4323 bytes .../img/entity-icon/disabled/kafka_consumer.png | Bin 0 -> 4038 bytes .../img/entity-icon/disabled/kafka_consumer_group.png | Bin 0 -> 4181 bytes .../entity-icon/disabled/kafka_consumer_lineage.png | Bin 0 -> 5299 bytes .../img/entity-icon/disabled/kafka_producer.png | Bin 0 -> 3737 bytes .../entity-icon/disabled/kafka_producer_lineage.png | Bin 0 -> 5108 bytes .../public/img/entity-icon/disabled/kafka_topic.png | Bin 6957 -> 3689 bytes dashboardv3/public/img/entity-icon/kafka_consumer.png | Bin 0 -> 4675 bytes .../public/img/entity-icon/kafka_consumer_group.png | Bin 0 -> 4835 bytes .../public/img/entity-icon/kafka_consumer_lineage.png | Bin 0 -> 7103 bytes dashboardv3/public/img/entity-icon/kafka_producer.png | Bin 0 -> 4188 bytes .../public/img/entity-icon/kafka_producer_lineage.png | Bin 0 -> 6749 bytes dashboardv3/public/img/entity-icon/kafka_topic.png| Bin 9659 -> 4323 bytes 24 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_consumer.png b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer.png new file mode 100644 index 000..d7e564f Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_group.png b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_group.png new file mode 100644 index 000..1bc9dad Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_group.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_lineage.png b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_lineage.png new file mode 100644 index 000..80248e9 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_lineage.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_producer.png b/dashboardv2/public/img/entity-icon/disabled/kafka_producer.png new file mode 100644 index 000..372cff4 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_producer.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_producer_lineage.png b/dashboardv2/public/img/entity-icon/disabled/kafka_producer_lineage.png new file mode 100644 index 000..c312b54 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_producer_lineage.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png b/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png index 9bed898..84cb234 100644 Binary files a/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png and b/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png differ diff --git a/dashboardv2/public/img/entity-icon/kafka_consumer.png b/dashboardv2/public/img/entity-icon/kafka_consumer.png new file mode 100644 index 000..5951283 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/kafka_consumer.png differ diff --git a/dashboardv2/public/img/entity-icon/kafka_consumer_group.png b/dashboardv2/public/img/entity-icon/kafka_consumer_group.png new file mode 100644 index 000..9b8e956 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/kafka_consumer_group.png differ diff --git a/dash
[atlas] branch master updated: ATLAS-4337: UI: Add entity icons for all the Kafka types.
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 ddf3bcf ATLAS-4337: UI: Add entity icons for all the Kafka types. ddf3bcf is described below commit ddf3bcff29b903f1efc6671285ddf8f3cc10c7c3 Author: prasad pawar AuthorDate: Tue Jun 15 16:45:44 2021 +0530 ATLAS-4337: UI: Add entity icons for all the Kafka types. Signed-off-by: nixonrodrigues --- .../img/entity-icon/disabled/kafka_consumer.png | Bin 0 -> 4038 bytes .../img/entity-icon/disabled/kafka_consumer_group.png | Bin 0 -> 4181 bytes .../entity-icon/disabled/kafka_consumer_lineage.png | Bin 0 -> 5299 bytes .../img/entity-icon/disabled/kafka_producer.png | Bin 0 -> 3737 bytes .../entity-icon/disabled/kafka_producer_lineage.png | Bin 0 -> 5108 bytes .../public/img/entity-icon/disabled/kafka_topic.png | Bin 6957 -> 3689 bytes dashboardv2/public/img/entity-icon/kafka_consumer.png | Bin 0 -> 4675 bytes .../public/img/entity-icon/kafka_consumer_group.png | Bin 0 -> 4835 bytes .../public/img/entity-icon/kafka_consumer_lineage.png | Bin 0 -> 7103 bytes dashboardv2/public/img/entity-icon/kafka_producer.png | Bin 0 -> 4188 bytes .../public/img/entity-icon/kafka_producer_lineage.png | Bin 0 -> 6749 bytes dashboardv2/public/img/entity-icon/kafka_topic.png| Bin 9659 -> 4323 bytes .../img/entity-icon/disabled/kafka_consumer.png | Bin 0 -> 4038 bytes .../img/entity-icon/disabled/kafka_consumer_group.png | Bin 0 -> 4181 bytes .../entity-icon/disabled/kafka_consumer_lineage.png | Bin 0 -> 5299 bytes .../img/entity-icon/disabled/kafka_producer.png | Bin 0 -> 3737 bytes .../entity-icon/disabled/kafka_producer_lineage.png | Bin 0 -> 5108 bytes .../public/img/entity-icon/disabled/kafka_topic.png | Bin 6957 -> 3689 bytes dashboardv3/public/img/entity-icon/kafka_consumer.png | Bin 0 -> 4675 bytes .../public/img/entity-icon/kafka_consumer_group.png | Bin 0 -> 4835 bytes .../public/img/entity-icon/kafka_consumer_lineage.png | Bin 0 -> 7103 bytes dashboardv3/public/img/entity-icon/kafka_producer.png | Bin 0 -> 4188 bytes .../public/img/entity-icon/kafka_producer_lineage.png | Bin 0 -> 6749 bytes dashboardv3/public/img/entity-icon/kafka_topic.png| Bin 9659 -> 4323 bytes 24 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_consumer.png b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer.png new file mode 100644 index 000..d7e564f Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_group.png b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_group.png new file mode 100644 index 000..1bc9dad Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_group.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_lineage.png b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_lineage.png new file mode 100644 index 000..80248e9 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_consumer_lineage.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_producer.png b/dashboardv2/public/img/entity-icon/disabled/kafka_producer.png new file mode 100644 index 000..372cff4 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_producer.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_producer_lineage.png b/dashboardv2/public/img/entity-icon/disabled/kafka_producer_lineage.png new file mode 100644 index 000..c312b54 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/kafka_producer_lineage.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png b/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png index 9bed898..84cb234 100644 Binary files a/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png and b/dashboardv2/public/img/entity-icon/disabled/kafka_topic.png differ diff --git a/dashboardv2/public/img/entity-icon/kafka_consumer.png b/dashboardv2/public/img/entity-icon/kafka_consumer.png new file mode 100644 index 000..5951283 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/kafka_consumer.png differ diff --git a/dashboardv2/public/img/entity-icon/kafka_consumer_group.png b/dashboardv2/public/img/entity-icon/kafka_consumer_group.png new file mode 100644 index 000..9b8e956 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/kafka_consumer_group.png differ diff --git a/dashboardv2/public/img/entity-icon/kafka_consumer_lineage.png b/dashboardv2/publ
[atlas] branch branch-2.0 updated: ATLAS-4327: UI: Deleting all glossaries and then switching to new UI results in unexpected behaviour.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new b8763b9 ATLAS-4327: UI: Deleting all glossaries and then switching to
new UI results in unexpected behaviour.
b8763b9 is described below
commit b8763b996e9430235e4d44539a46c3d56a6d11ac
Author: prasad pawar
AuthorDate: Wed Jun 9 16:45:23 2021 +0530
ATLAS-4327: UI: Deleting all glossaries and then switching to new UI
results in unexpected behaviour.
Signed-off-by: nixonrodrigues
(cherry picked from commit 817afa0a33d31a32f5ed94e30a8e6584eccf77a9)
---
dashboardv3/public/js/router/Router.js | 5 +
1 file changed, 5 insertions(+)
diff --git a/dashboardv3/public/js/router/Router.js
b/dashboardv3/public/js/router/Router.js
index bd50715..eb8d042 100644
--- a/dashboardv3/public/js/router/Router.js
+++ b/dashboardv3/public/js/router/Router.js
@@ -237,6 +237,11 @@ define([
var that = this;
require(["views/site/Header",
"views/glossary/GlossaryContainerLayoutView",
"views/search/SearchDefaultLayoutView", "views/site/SideNavLayoutView"],
function(Header, GlossaryContainerLayoutView, SearchDefaultLayoutView,
SideNavLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams();
+//Below if condition is added to handle "when Glossary tab
does not have any glossary and selected in Old UI and switched to New UI is
show continous loading
+if (paramObj === undefined) {
+that.defaultAction();
+return;
+}
that.renderViewIfNotExists(that.getHeaderOptions(Header));
var options = _.extend({
guid: id,
[atlas] branch master updated: ATLAS-4327: UI: Deleting all glossaries and then switching to new UI results in unexpected behaviour.
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 817afa0 ATLAS-4327: UI: Deleting all glossaries and then switching to
new UI results in unexpected behaviour.
817afa0 is described below
commit 817afa0a33d31a32f5ed94e30a8e6584eccf77a9
Author: prasad pawar
AuthorDate: Wed Jun 9 16:45:23 2021 +0530
ATLAS-4327: UI: Deleting all glossaries and then switching to new UI
results in unexpected behaviour.
Signed-off-by: nixonrodrigues
---
dashboardv3/public/js/router/Router.js | 5 +
1 file changed, 5 insertions(+)
diff --git a/dashboardv3/public/js/router/Router.js
b/dashboardv3/public/js/router/Router.js
index bd50715..eb8d042 100644
--- a/dashboardv3/public/js/router/Router.js
+++ b/dashboardv3/public/js/router/Router.js
@@ -237,6 +237,11 @@ define([
var that = this;
require(["views/site/Header",
"views/glossary/GlossaryContainerLayoutView",
"views/search/SearchDefaultLayoutView", "views/site/SideNavLayoutView"],
function(Header, GlossaryContainerLayoutView, SearchDefaultLayoutView,
SideNavLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams();
+//Below if condition is added to handle "when Glossary tab
does not have any glossary and selected in Old UI and switched to New UI is
show continous loading
+if (paramObj === undefined) {
+that.defaultAction();
+return;
+}
that.renderViewIfNotExists(that.getHeaderOptions(Header));
var options = _.extend({
guid: id,
[atlas] branch branch-2.0 updated: ATLAS-4328: UI: Add flink type icons / images. via (Josh Yeh )
This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git The following commit(s) were added to refs/heads/branch-2.0 by this push: new 2733758 ATLAS-4328: UI: Add flink type icons / images. via (Josh Yeh ) 2733758 is described below commit 2733758bb2935aea96793e4adbb9793043f074f2 Author: prasad pawar AuthorDate: Fri Jun 11 10:55:38 2021 +0530 ATLAS-4328: UI: Add flink type icons / images. via (Josh Yeh ) Signed-off-by: nixonrodrigues (cherry picked from commit cf925b6821854a6d6accd1875a3b67805cae110c) --- dashboardv2/public/img/entity-icon/disabled/flink.png | Bin 0 -> 6876 bytes .../img/entity-icon/disabled/flink_application.png | Bin 0 -> 6876 bytes .../disabled/flink_application_processes.png| Bin 0 -> 8213 bytes .../public/img/entity-icon/disabled/flink_process.png | Bin 0 -> 6876 bytes dashboardv2/public/img/entity-icon/flink.png| Bin 0 -> 10413 bytes .../public/img/entity-icon/flink_application.png| Bin 0 -> 10413 bytes .../img/entity-icon/flink_application_processes.png | Bin 0 -> 12246 bytes dashboardv2/public/img/entity-icon/flink_process.png| Bin 0 -> 10413 bytes dashboardv3/public/img/entity-icon/disabled/flink.png | Bin 0 -> 6876 bytes .../img/entity-icon/disabled/flink_application.png | Bin 0 -> 6876 bytes .../disabled/flink_application_processes.png| Bin 0 -> 8213 bytes .../public/img/entity-icon/disabled/flink_process.png | Bin 0 -> 6876 bytes dashboardv3/public/img/entity-icon/flink.png| Bin 0 -> 10413 bytes .../public/img/entity-icon/flink_application.png| Bin 0 -> 10413 bytes .../img/entity-icon/flink_application_processes.png | Bin 0 -> 12246 bytes dashboardv3/public/img/entity-icon/flink_process.png| Bin 0 -> 10413 bytes 16 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dashboardv2/public/img/entity-icon/disabled/flink.png b/dashboardv2/public/img/entity-icon/disabled/flink.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/flink.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/flink_application.png b/dashboardv2/public/img/entity-icon/disabled/flink_application.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/flink_application.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/flink_application_processes.png b/dashboardv2/public/img/entity-icon/disabled/flink_application_processes.png new file mode 100644 index 000..28d4ed9 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/flink_application_processes.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/flink_process.png b/dashboardv2/public/img/entity-icon/disabled/flink_process.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/flink_process.png differ diff --git a/dashboardv2/public/img/entity-icon/flink.png b/dashboardv2/public/img/entity-icon/flink.png new file mode 100644 index 000..9a94d12 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/flink.png differ diff --git a/dashboardv2/public/img/entity-icon/flink_application.png b/dashboardv2/public/img/entity-icon/flink_application.png new file mode 100644 index 000..9a94d12 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/flink_application.png differ diff --git a/dashboardv2/public/img/entity-icon/flink_application_processes.png b/dashboardv2/public/img/entity-icon/flink_application_processes.png new file mode 100644 index 000..53237ab Binary files /dev/null and b/dashboardv2/public/img/entity-icon/flink_application_processes.png differ diff --git a/dashboardv2/public/img/entity-icon/flink_process.png b/dashboardv2/public/img/entity-icon/flink_process.png new file mode 100644 index 000..9a94d12 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/flink_process.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/flink.png b/dashboardv3/public/img/entity-icon/disabled/flink.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/disabled/flink.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/flink_application.png b/dashboardv3/public/img/entity-icon/disabled/flink_application.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/disabled/flink_application.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/flink_application_processes.png b/dashboardv3/public/img/entity-icon/disabled/flink_application_processes.png new file mode 100644 inde
[atlas] branch master updated: ATLAS-4328: UI: Add flink type icons / images. via (Josh Yeh )
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 cf925b6 ATLAS-4328: UI: Add flink type icons / images. via (Josh Yeh ) cf925b6 is described below commit cf925b6821854a6d6accd1875a3b67805cae110c Author: prasad pawar AuthorDate: Fri Jun 11 10:55:38 2021 +0530 ATLAS-4328: UI: Add flink type icons / images. via (Josh Yeh ) Signed-off-by: nixonrodrigues --- dashboardv2/public/img/entity-icon/disabled/flink.png | Bin 0 -> 6876 bytes .../img/entity-icon/disabled/flink_application.png | Bin 0 -> 6876 bytes .../disabled/flink_application_processes.png| Bin 0 -> 8213 bytes .../public/img/entity-icon/disabled/flink_process.png | Bin 0 -> 6876 bytes dashboardv2/public/img/entity-icon/flink.png| Bin 0 -> 10413 bytes .../public/img/entity-icon/flink_application.png| Bin 0 -> 10413 bytes .../img/entity-icon/flink_application_processes.png | Bin 0 -> 12246 bytes dashboardv2/public/img/entity-icon/flink_process.png| Bin 0 -> 10413 bytes dashboardv3/public/img/entity-icon/disabled/flink.png | Bin 0 -> 6876 bytes .../img/entity-icon/disabled/flink_application.png | Bin 0 -> 6876 bytes .../disabled/flink_application_processes.png| Bin 0 -> 8213 bytes .../public/img/entity-icon/disabled/flink_process.png | Bin 0 -> 6876 bytes dashboardv3/public/img/entity-icon/flink.png| Bin 0 -> 10413 bytes .../public/img/entity-icon/flink_application.png| Bin 0 -> 10413 bytes .../img/entity-icon/flink_application_processes.png | Bin 0 -> 12246 bytes dashboardv3/public/img/entity-icon/flink_process.png| Bin 0 -> 10413 bytes 16 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dashboardv2/public/img/entity-icon/disabled/flink.png b/dashboardv2/public/img/entity-icon/disabled/flink.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/flink.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/flink_application.png b/dashboardv2/public/img/entity-icon/disabled/flink_application.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/flink_application.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/flink_application_processes.png b/dashboardv2/public/img/entity-icon/disabled/flink_application_processes.png new file mode 100644 index 000..28d4ed9 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/flink_application_processes.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/flink_process.png b/dashboardv2/public/img/entity-icon/disabled/flink_process.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/flink_process.png differ diff --git a/dashboardv2/public/img/entity-icon/flink.png b/dashboardv2/public/img/entity-icon/flink.png new file mode 100644 index 000..9a94d12 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/flink.png differ diff --git a/dashboardv2/public/img/entity-icon/flink_application.png b/dashboardv2/public/img/entity-icon/flink_application.png new file mode 100644 index 000..9a94d12 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/flink_application.png differ diff --git a/dashboardv2/public/img/entity-icon/flink_application_processes.png b/dashboardv2/public/img/entity-icon/flink_application_processes.png new file mode 100644 index 000..53237ab Binary files /dev/null and b/dashboardv2/public/img/entity-icon/flink_application_processes.png differ diff --git a/dashboardv2/public/img/entity-icon/flink_process.png b/dashboardv2/public/img/entity-icon/flink_process.png new file mode 100644 index 000..9a94d12 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/flink_process.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/flink.png b/dashboardv3/public/img/entity-icon/disabled/flink.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/disabled/flink.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/flink_application.png b/dashboardv3/public/img/entity-icon/disabled/flink_application.png new file mode 100644 index 000..af78144 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/disabled/flink_application.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/flink_application_processes.png b/dashboardv3/public/img/entity-icon/disabled/flink_application_processes.png new file mode 100644 index 000..28d4ed9 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/
[atlas] branch branch-2.0 updated: Revert "ATLAS-4058: UI: Fix Entity detail page Hive Column Position with 0 is set to NA."
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 55cb081 Revert "ATLAS-4058: UI: Fix Entity detail page Hive Column
Position with 0 is set to NA."
55cb081 is described below
commit 55cb08102214c8095fb0241d19ee792b035a58c2
Author: nixonrodrigues
AuthorDate: Thu Jun 10 19:34:50 2021 +0530
Revert "ATLAS-4058: UI: Fix Entity detail page Hive Column Position with 0
is set to NA."
This reverts commit de87800c19ea06f53904a2948fcde29a57d2f051.
(cherry picked from commit 1078f25e90134be4a7e9f35f9774c113909aba97)
---
.../public/js/views/audit/CreateAuditTableLayoutView.js| 3 ---
.../public/js/views/entity/EntityDetailTableLayoutView.js | 10 +-
.../public/js/views/audit/CreateAuditTableLayoutView.js| 3 ---
.../public/js/views/entity/EntityDetailTableLayoutView.js | 10 +-
4 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
index e107a2d..20eac06 100644
--- a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -95,9 +95,6 @@ define(['require',
getValue: function(val, key) {
if (key && key.toLowerCase().indexOf("time") > 0) {
return Utils.formatDate({ date: val });
-} else if (key &&
key.toLowerCase().indexOf("position") === 0 && val === 0) {
-//if position value is 0 we are showing N/A
-return "N/A";
} else {
return val;
}
diff --git a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
index a47e075..a5b5262 100644
--- a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -81,15 +81,7 @@ define(['require',
scope: this,
valueObject: _.extend({ "isIncomplete":
this.entity.isIncomplete }, this.entity.attributes),
attributeDefs: this.attributeDefs,
-highlightString: highlightString,
-getValue: function(val, key) {
-if (key && key.toLowerCase().indexOf("position")
=== 0 && val === 0) {
-//if position value is 0 we are showing N/A
-return "N/A";
-} else {
-return val;
-}
-}
+highlightString: highlightString
});
this.ui.detailValue.append(table);
Utils.togglePropertyRelationshipTableEmptyValues({
diff --git a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
index 7758821..0e2ade3 100644
--- a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -96,9 +96,6 @@ define(['require',
getValue: function(val, key) {
if (key && key.toLowerCase().indexOf("time") > 0) {
return Utils.formatDate({ date: val });
-} else if (key &&
key.toLowerCase().indexOf("position") === 0 && val === 0) {
-//if position value is 0 we are showing N/A
-return "N/A";
} else {
return val;
}
diff --git a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
index a47e075..a5b5262 100644
--- a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -81,15 +81,7 @@ define(['require',
scope: this,
valueObject: _.extend({ "isIncomplete":
this.entity.isIncomplete }, this.entity.attributes),
attributeDefs: this.attributeDefs,
-highlightString: highlightString,
-getValue: functi
[atlas] branch master updated: Revert "ATLAS-4058: UI: Fix Entity detail page Hive Column Position with 0 is set to NA."
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 1078f25 Revert "ATLAS-4058: UI: Fix Entity detail page Hive Column
Position with 0 is set to NA."
1078f25 is described below
commit 1078f25e90134be4a7e9f35f9774c113909aba97
Author: nixonrodrigues
AuthorDate: Thu Jun 10 19:34:50 2021 +0530
Revert "ATLAS-4058: UI: Fix Entity detail page Hive Column Position with 0
is set to NA."
This reverts commit de87800c19ea06f53904a2948fcde29a57d2f051.
---
.../public/js/views/audit/CreateAuditTableLayoutView.js| 3 ---
.../public/js/views/entity/EntityDetailTableLayoutView.js | 10 +-
.../public/js/views/audit/CreateAuditTableLayoutView.js| 3 ---
.../public/js/views/entity/EntityDetailTableLayoutView.js | 10 +-
4 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
index e107a2d..20eac06 100644
--- a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -95,9 +95,6 @@ define(['require',
getValue: function(val, key) {
if (key && key.toLowerCase().indexOf("time") > 0) {
return Utils.formatDate({ date: val });
-} else if (key &&
key.toLowerCase().indexOf("position") === 0 && val === 0) {
-//if position value is 0 we are showing N/A
-return "N/A";
} else {
return val;
}
diff --git a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
index a47e075..a5b5262 100644
--- a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -81,15 +81,7 @@ define(['require',
scope: this,
valueObject: _.extend({ "isIncomplete":
this.entity.isIncomplete }, this.entity.attributes),
attributeDefs: this.attributeDefs,
-highlightString: highlightString,
-getValue: function(val, key) {
-if (key && key.toLowerCase().indexOf("position")
=== 0 && val === 0) {
-//if position value is 0 we are showing N/A
-return "N/A";
-} else {
-return val;
-}
-}
+highlightString: highlightString
});
this.ui.detailValue.append(table);
Utils.togglePropertyRelationshipTableEmptyValues({
diff --git a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
index 7758821..0e2ade3 100644
--- a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -96,9 +96,6 @@ define(['require',
getValue: function(val, key) {
if (key && key.toLowerCase().indexOf("time") > 0) {
return Utils.formatDate({ date: val });
-} else if (key &&
key.toLowerCase().indexOf("position") === 0 && val === 0) {
-//if position value is 0 we are showing N/A
-return "N/A";
} else {
return val;
}
diff --git a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
index a47e075..a5b5262 100644
--- a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -81,15 +81,7 @@ define(['require',
scope: this,
valueObject: _.extend({ "isIncomplete":
this.entity.isIncomplete }, this.entity.attributes),
attributeDefs: this.attributeDefs,
-highlightString: highlightString,
-getValue: function(val, key) {
-if (key && key.toLowerCase().inde
[atlas] 01/03: ATLAS-4295: UI: The short/long description of term & category doesnt get updated immediately when made blank, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 5f81e288ca11781cd3afba49e82a60565e53fe60
Author: prasad pawar
AuthorDate: Fri Jun 4 17:23:11 2021 +0530
ATLAS-4295: UI: The short/long description of term & category doesnt get
updated immediately when made blank,fixed
Signed-off-by: nixonrodrigues
(cherry picked from commit 0a43c1980c75f37a58fbb69347ec7a0e8f508126)
---
dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js | 4 ++--
dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
index 24a8b06..e30034c 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -297,8 +297,8 @@ define(['require',
Utils.hideTitleLoader(this.$('.fontLoader'), this.ui.details);
if (data) {
this.ui.title.text(data.name || data.displayText ||
data.qualifiedName);
-this.ui.shortDescription.text(data.shortDescription);
-this.ui.longDescription.text(data.longDescription);
+this.ui.shortDescription.text(data.shortDescription ?
data.shortDescription : "");
+this.ui.longDescription.text(data.longDescription ?
data.longDescription : "");
this.generateCategories(data.categories);
this.generateTerm(data.terms);
this.generateTag(data.classifications);
diff --git a/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
index 24bfa2a..8b305e8 100644
--- a/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -312,8 +312,8 @@ define(['require',
Utils.hideTitleLoader(this.$('.fontLoader'), this.ui.details);
if (data) {
this.ui.title.text(data.name || data.displayText ||
data.qualifiedName);
-this.ui.shortDescription.text(data.shortDescription);
-this.ui.longDescription.text(data.longDescription);
+this.ui.shortDescription.text(data.shortDescription ?
data.shortDescription : "");
+this.ui.longDescription.text(data.longDescription ?
data.longDescription : "");
this.generateCategories(data.categories);
this.generateTerm(data.terms);
this.generateTag(data.classifications);
[atlas] branch branch-2.0 updated (75ee653 -> 3bca8b8)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from 75ee653 ATLAS-4329: Update Kafka version to 2.5 new 5f81e28 ATLAS-4295: UI: The short/long description of term & category doesnt get updated immediately when made blank,fixed new a2ca616 ATLAS-4283:UI: Description cannot be made blank for classification,fixed new 3bca8b8 ATLAS-4326: Atlas UI: Multiple continuous space is accepted on Short description for Classifications, Gloassarys, Categorys & Terms, fixed #2. 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/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++-- dashboardv2/public/js/utils/CommonViewFunction.js | 3 +++ dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js| 4 ++-- dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++-- dashboardv2/public/js/views/tag/TagLayoutView.js| 6 ++ dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++-- dashboardv3/public/js/utils/CommonViewFunction.js | 3 +++ dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js| 4 ++-- .../public/js/views/search/tree/ClassificationTreeLayoutView.js | 6 ++ dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++-- 10 files changed, 32 insertions(+), 12 deletions(-)
[atlas] 03/03: ATLAS-4326: Atlas UI: Multiple continuous space is accepted on Short description for Classifications, Gloassarys, Categorys & Terms, fixed #2.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 3bca8b8482a615daf6a1c74cebc46b643e2753ae
Author: prasad pawar
AuthorDate: Tue Jun 8 17:01:34 2021 +0530
ATLAS-4326: Atlas UI: Multiple continuous space is accepted on Short
description for Classifications, Gloassarys, Categorys & Terms, fixed #2.
Signed-off-by: nixonrodrigues
(cherry picked from commit e8832f0dbb203dc33475a49711463929b984a37b)
---
dashboardv2/public/js/utils/CommonViewFunction.js| 3 +++
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++--
dashboardv2/public/js/views/tag/TagLayoutView.js | 5 -
dashboardv3/public/js/utils/CommonViewFunction.js| 3 +++
.../public/js/views/search/tree/ClassificationTreeLayoutView.js | 5 -
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++--
6 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index bb3fa3f..8c2df51 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -710,6 +710,9 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
"okText": model ? "Update" : "Create",
"allowCancel": true
}).open();
+modal.$el.find('input[data-id=shortDescription]').on('input
keydown', function(e) {
+$(this).val($(this).val().replace(/\s+/g, ' '));
+});
modal.$el.find('button.ok').attr("disabled", "true");
modal.on('ok', function() {
modal.$el.find('button.ok').showButtonLoader();
diff --git a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
index 8e7e6c3..be33e7c 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -276,14 +276,14 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
-if (this.model.get('description') ===
view.ui.description.val() || view.ui.description.val().length == 0) {
+if (this.model.get('description') ===
view.ui.description.val() || view.ui.description.val().length == 0 ||
view.ui.description.val().trim().length === 0) {
this.modal.$el.find('button.ok').prop('disabled', true);
} else {
this.modal.$el.find('button.ok').prop('disabled', false);
}
},
onPublishClick: function(view) {
-var saveObj = _.extend(this.model.toJSON(), { 'description':
view.ui.description.val() });
+var saveObj = _.extend(this.model.toJSON(), { 'description':
view.ui.description.val().trim() });
this.onSaveButton(saveObj,
Messages.tag.updateTagDescriptionMessage);
this.ui.description.show();
},
@@ -303,6 +303,7 @@ define(['require',
allowCancel: true,
}).open();
view.ui.description.on('keyup input', function(e) {
+$(this).val($(this).val().replace(/\s+/g, ' '));
that.textAreaChangeEvent(view);
e.stopPropagation();
});
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index 9dd15b4..38df187 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -403,7 +403,10 @@ define(['require',
}).open();
modal.$el.find('button.ok').attr("disabled", "true");
view.ui.tagName.on('keyup input', function(e) {
-view.ui.description.val(this.value);
+view.ui.description.val($(this).val().replace(/\s+/g,
' '));
+});
+view.ui.description.on('input keydown', function(e) {
+$(this).val($(this).val().replace(/\s+/g, ' '));
});
modal.on('shownModal', function() {
view.ui.parentTag.select2({
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index 34afa2d..e739544 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -730,6 +730,9
[atlas] 02/03: ATLAS-4283:UI: Description cannot be made blank for classification, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit a2ca616a9183b7931e12701306ca3ae49b742d11
Author: prasad pawar
AuthorDate: Fri May 21 19:00:56 2021 +0530
ATLAS-4283:UI: Description cannot be made blank for classification,fixed
Signed-off-by: nixonrodrigues
(cherry picked from commit f048f84e78840387822d5ab5a5678f17756aa0b1)
---
dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++--
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 2 +-
dashboardv2/public/js/views/tag/TagLayoutView.js | 3 +++
dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++--
.../public/js/views/search/tree/ClassificationTreeLayoutView.js | 3 +++
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
b/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
index 0f2ba8a..27ea912 100644
--- a/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
@@ -28,9 +28,9 @@
{{/if}}
-Description
+Description
-
+
{{#if create}}
diff --git a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
index 9b8b90f..8e7e6c3 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -276,7 +276,7 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
-if (this.model.get('description') ===
view.ui.description.val()) {
+if (this.model.get('description') ===
view.ui.description.val() || view.ui.description.val().length == 0) {
this.modal.$el.find('button.ok').prop('disabled', true);
} else {
this.modal.$el.find('button.ok').prop('disabled', false);
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index f408469..9dd15b4 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -402,6 +402,9 @@ define(['require',
allowCancel: true,
}).open();
modal.$el.find('button.ok').attr("disabled", "true");
+view.ui.tagName.on('keyup input', function(e) {
+view.ui.description.val(this.value);
+});
modal.on('shownModal', function() {
view.ui.parentTag.select2({
multiple: true,
diff --git a/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
b/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
index 0f2ba8a..27ea912 100644
--- a/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
@@ -28,9 +28,9 @@
{{/if}}
-Description
+Description
-
+
{{#if create}}
diff --git
a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index 75e53cd..18d3650 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -686,6 +686,9 @@ define([
allowCancel: true
}).open();
modal.$el.find("button.ok").attr("disabled", "true");
+view.ui.tagName.on('keyup input', function(e) {
+view.ui.description.val(this.value);
+});
modal.on("shownModal", function() {
view.ui.parentTag.select2({
multiple: true,
diff --git a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
index 6e10155..cabf32b 100644
--- a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -280,7 +280,7 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
-if (this.model.get('description') ===
view.ui.descripti
[atlas] branch master updated (8db2ccc -> e8832f0)
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 8db2ccc ATLAS-4329: Update Kafka version to 2.5 new 0a43c19 ATLAS-4295: UI: The short/long description of term & category doesnt get updated immediately when made blank,fixed new f048f84 ATLAS-4283:UI: Description cannot be made blank for classification,fixed new e8832f0 ATLAS-4326: Atlas UI: Multiple continuous space is accepted on Short description for Classifications, Gloassarys, Categorys & Terms, fixed #2. 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/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++-- dashboardv2/public/js/utils/CommonViewFunction.js | 3 +++ dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js| 4 ++-- dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++-- dashboardv2/public/js/views/tag/TagLayoutView.js| 6 ++ dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++-- dashboardv3/public/js/utils/CommonViewFunction.js | 3 +++ dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js| 4 ++-- .../public/js/views/search/tree/ClassificationTreeLayoutView.js | 6 ++ dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++-- 10 files changed, 32 insertions(+), 12 deletions(-)
[atlas] 02/03: ATLAS-4283:UI: Description cannot be made blank for classification, fixed
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 f048f84e78840387822d5ab5a5678f17756aa0b1
Author: prasad pawar
AuthorDate: Fri May 21 19:00:56 2021 +0530
ATLAS-4283:UI: Description cannot be made blank for classification,fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++--
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 2 +-
dashboardv2/public/js/views/tag/TagLayoutView.js | 3 +++
dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++--
.../public/js/views/search/tree/ClassificationTreeLayoutView.js | 3 +++
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
b/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
index 0f2ba8a..27ea912 100644
--- a/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
@@ -28,9 +28,9 @@
{{/if}}
-Description
+Description
-
+
{{#if create}}
diff --git a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
index 9b8b90f..8e7e6c3 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -276,7 +276,7 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
-if (this.model.get('description') ===
view.ui.description.val()) {
+if (this.model.get('description') ===
view.ui.description.val() || view.ui.description.val().length == 0) {
this.modal.$el.find('button.ok').prop('disabled', true);
} else {
this.modal.$el.find('button.ok').prop('disabled', false);
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index f408469..9dd15b4 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -402,6 +402,9 @@ define(['require',
allowCancel: true,
}).open();
modal.$el.find('button.ok').attr("disabled", "true");
+view.ui.tagName.on('keyup input', function(e) {
+view.ui.description.val(this.value);
+});
modal.on('shownModal', function() {
view.ui.parentTag.select2({
multiple: true,
diff --git a/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
b/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
index 0f2ba8a..27ea912 100644
--- a/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
@@ -28,9 +28,9 @@
{{/if}}
-Description
+Description
-
+
{{#if create}}
diff --git
a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index 75e53cd..18d3650 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -686,6 +686,9 @@ define([
allowCancel: true
}).open();
modal.$el.find("button.ok").attr("disabled", "true");
+view.ui.tagName.on('keyup input', function(e) {
+view.ui.description.val(this.value);
+});
modal.on("shownModal", function() {
view.ui.parentTag.select2({
multiple: true,
diff --git a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
index 6e10155..cabf32b 100644
--- a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -280,7 +280,7 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
-if (this.model.get('description') ===
view.ui.description.val()) {
+if (this.model.get('description') ===
view.u
[atlas] 03/03: ATLAS-4326: Atlas UI: Multiple continuous space is accepted on Short description for Classifications, Gloassarys, Categorys & Terms, fixed #2.
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 e8832f0dbb203dc33475a49711463929b984a37b
Author: prasad pawar
AuthorDate: Tue Jun 8 17:01:34 2021 +0530
ATLAS-4326: Atlas UI: Multiple continuous space is accepted on Short
description for Classifications, Gloassarys, Categorys & Terms, fixed #2.
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/utils/CommonViewFunction.js| 3 +++
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++--
dashboardv2/public/js/views/tag/TagLayoutView.js | 5 -
dashboardv3/public/js/utils/CommonViewFunction.js| 3 +++
.../public/js/views/search/tree/ClassificationTreeLayoutView.js | 5 -
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++--
6 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index bb3fa3f..8c2df51 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -710,6 +710,9 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
"okText": model ? "Update" : "Create",
"allowCancel": true
}).open();
+modal.$el.find('input[data-id=shortDescription]').on('input
keydown', function(e) {
+$(this).val($(this).val().replace(/\s+/g, ' '));
+});
modal.$el.find('button.ok').attr("disabled", "true");
modal.on('ok', function() {
modal.$el.find('button.ok').showButtonLoader();
diff --git a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
index 8e7e6c3..be33e7c 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -276,14 +276,14 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
-if (this.model.get('description') ===
view.ui.description.val() || view.ui.description.val().length == 0) {
+if (this.model.get('description') ===
view.ui.description.val() || view.ui.description.val().length == 0 ||
view.ui.description.val().trim().length === 0) {
this.modal.$el.find('button.ok').prop('disabled', true);
} else {
this.modal.$el.find('button.ok').prop('disabled', false);
}
},
onPublishClick: function(view) {
-var saveObj = _.extend(this.model.toJSON(), { 'description':
view.ui.description.val() });
+var saveObj = _.extend(this.model.toJSON(), { 'description':
view.ui.description.val().trim() });
this.onSaveButton(saveObj,
Messages.tag.updateTagDescriptionMessage);
this.ui.description.show();
},
@@ -303,6 +303,7 @@ define(['require',
allowCancel: true,
}).open();
view.ui.description.on('keyup input', function(e) {
+$(this).val($(this).val().replace(/\s+/g, ' '));
that.textAreaChangeEvent(view);
e.stopPropagation();
});
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index 9dd15b4..38df187 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -403,7 +403,10 @@ define(['require',
}).open();
modal.$el.find('button.ok').attr("disabled", "true");
view.ui.tagName.on('keyup input', function(e) {
-view.ui.description.val(this.value);
+view.ui.description.val($(this).val().replace(/\s+/g,
' '));
+});
+view.ui.description.on('input keydown', function(e) {
+$(this).val($(this).val().replace(/\s+/g, ' '));
});
modal.on('shownModal', function() {
view.ui.parentTag.select2({
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index 34afa2d..e739544 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -730,6 +730,9 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
[atlas] 01/03: ATLAS-4295: UI: The short/long description of term & category doesnt get updated immediately when made blank, fixed
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 0a43c1980c75f37a58fbb69347ec7a0e8f508126
Author: prasad pawar
AuthorDate: Fri Jun 4 17:23:11 2021 +0530
ATLAS-4295: UI: The short/long description of term & category doesnt get
updated immediately when made blank,fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js | 4 ++--
dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
index 24a8b06..e30034c 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -297,8 +297,8 @@ define(['require',
Utils.hideTitleLoader(this.$('.fontLoader'), this.ui.details);
if (data) {
this.ui.title.text(data.name || data.displayText ||
data.qualifiedName);
-this.ui.shortDescription.text(data.shortDescription);
-this.ui.longDescription.text(data.longDescription);
+this.ui.shortDescription.text(data.shortDescription ?
data.shortDescription : "");
+this.ui.longDescription.text(data.longDescription ?
data.longDescription : "");
this.generateCategories(data.categories);
this.generateTerm(data.terms);
this.generateTag(data.classifications);
diff --git a/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
index 24bfa2a..8b305e8 100644
--- a/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -312,8 +312,8 @@ define(['require',
Utils.hideTitleLoader(this.$('.fontLoader'), this.ui.details);
if (data) {
this.ui.title.text(data.name || data.displayText ||
data.qualifiedName);
-this.ui.shortDescription.text(data.shortDescription);
-this.ui.longDescription.text(data.longDescription);
+this.ui.shortDescription.text(data.shortDescription ?
data.shortDescription : "");
+this.ui.longDescription.text(data.longDescription ?
data.longDescription : "");
this.generateCategories(data.categories);
this.generateTerm(data.terms);
this.generateTag(data.classifications);
[atlas] 01/02: ATLAS-4294:Atlas UI : Format long description of Glossary term and category UI, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 4287857bdae963f92d033d94e00e5edcf53e2a94
Author: prasad pawar
AuthorDate: Fri May 21 13:56:52 2021 +0530
ATLAS-4294:Atlas UI : Format long description of Glossary term and category
UI, fixed
Signed-off-by: nixonrodrigues
(cherry picked from commit f9d447d6ec0c6ac7a240b8965bac69fb4bf9c50d)
---
dashboardv2/public/css/scss/common.scss | 6 ++
.../public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html | 4 ++--
dashboardv3/public/css/scss/common.scss | 6 ++
.../public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html | 4 ++--
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/css/scss/common.scss
b/dashboardv2/public/css/scss/common.scss
index e93eef1..5bf8b61 100644
--- a/dashboardv2/public/css/scss/common.scss
+++ b/dashboardv2/public/css/scss/common.scss
@@ -338,4 +338,10 @@ pre {
cursor: pointer;
}
}
+}
+
+.long-description {
+width: 85%;
+cursor: default !important;
+background-color: transparent !important;
}
\ No newline at end of file
diff --git
a/dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
b/dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
index 61a134c..4600df7 100644
---
a/dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
+++
b/dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
@@ -29,8 +29,8 @@
Long Description:
-
-
+
+
{{#if isTermView}}
diff --git a/dashboardv3/public/css/scss/common.scss
b/dashboardv3/public/css/scss/common.scss
index c620838..9310e20 100644
--- a/dashboardv3/public/css/scss/common.scss
+++ b/dashboardv3/public/css/scss/common.scss
@@ -337,4 +337,10 @@ pre {
cursor: pointer;
}
}
+}
+
+.long-description {
+width: 85%;
+cursor: default !important;
+background-color: transparent !important;
}
\ No newline at end of file
diff --git
a/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
b/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
index 89ec57a..b69dac5 100644
---
a/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
+++
b/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
@@ -32,8 +32,8 @@
Long Description:
-
-
+
+
{{#if isTermView}}
[atlas] 02/02: ATLAS-4325:[Atlas: Glossary Term Bulk Import] [UI] Unable to perform bulk import glossary term via UI, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 62d36cfe4cd12f218305e283b3231ddadefe1ec7
Author: prasad pawar
AuthorDate: Fri Jun 4 15:04:06 2021 +0530
ATLAS-4325:[Atlas: Glossary Term Bulk Import] [UI] Unable to perform bulk
import glossary term via UI, fixed
Signed-off-by: nixonrodrigues
(cherry picked from commit ae3f655872c3a114ef1b38e2de77d270530e8db6)
---
dashboardv2/public/js/views/import/ImportLayoutView.js | 2 +-
dashboardv3/public/js/views/import/ImportLayoutView.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/import/ImportLayoutView.js
b/dashboardv2/public/js/views/import/ImportLayoutView.js
index 88d553c..27440bb 100644
--- a/dashboardv2/public/js/views/import/ImportLayoutView.js
+++ b/dashboardv2/public/js/views/import/ImportLayoutView.js
@@ -91,7 +91,7 @@ define([
}
}
var headers = {};
-headers[CommonViewFunction.restCsrfCustomHeader] = '""';
+headers[CommonViewFunction.restCsrfCustomHeader] =
CommonViewFunction.restCsrfValue || '""';
this.ui.importGlossary.dropzone({
url: that.isGlossary ? UrlLinks.glossaryImportUrl() :
UrlLinks.businessMetadataImportUrl(),
clickable: true,
diff --git a/dashboardv3/public/js/views/import/ImportLayoutView.js
b/dashboardv3/public/js/views/import/ImportLayoutView.js
index 88d553c..27440bb 100644
--- a/dashboardv3/public/js/views/import/ImportLayoutView.js
+++ b/dashboardv3/public/js/views/import/ImportLayoutView.js
@@ -91,7 +91,7 @@ define([
}
}
var headers = {};
-headers[CommonViewFunction.restCsrfCustomHeader] = '""';
+headers[CommonViewFunction.restCsrfCustomHeader] =
CommonViewFunction.restCsrfValue || '""';
this.ui.importGlossary.dropzone({
url: that.isGlossary ? UrlLinks.glossaryImportUrl() :
UrlLinks.businessMetadataImportUrl(),
clickable: true,
[atlas] branch branch-2.0 updated (a873395 -> 62d36cf)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from a873395 ATLAS-3812: Apache Flink model for Atlas. new 4287857 ATLAS-4294:Atlas UI : Format long description of Glossary term and category UI, fixed new 62d36cf ATLAS-4325:[Atlas: Glossary Term Bulk Import] [UI] Unable to perform bulk import glossary term via UI, fixed 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: dashboardv2/public/css/scss/common.scss | 6 ++ .../public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html | 4 ++-- dashboardv2/public/js/views/import/ImportLayoutView.js | 2 +- dashboardv3/public/css/scss/common.scss | 6 ++ .../public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html | 4 ++-- dashboardv3/public/js/views/import/ImportLayoutView.js | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-)
[atlas] 02/02: ATLAS-4294:Atlas UI : Format long description of Glossary term and category UI, fixed
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 f9d447d6ec0c6ac7a240b8965bac69fb4bf9c50d
Author: prasad pawar
AuthorDate: Fri May 21 13:56:52 2021 +0530
ATLAS-4294:Atlas UI : Format long description of Glossary term and category
UI, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/css/scss/common.scss | 6 ++
.../public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html | 4 ++--
dashboardv3/public/css/scss/common.scss | 6 ++
.../public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html | 4 ++--
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/css/scss/common.scss
b/dashboardv2/public/css/scss/common.scss
index e93eef1..5bf8b61 100644
--- a/dashboardv2/public/css/scss/common.scss
+++ b/dashboardv2/public/css/scss/common.scss
@@ -338,4 +338,10 @@ pre {
cursor: pointer;
}
}
+}
+
+.long-description {
+width: 85%;
+cursor: default !important;
+background-color: transparent !important;
}
\ No newline at end of file
diff --git
a/dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
b/dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
index 61a134c..4600df7 100644
---
a/dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
+++
b/dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
@@ -29,8 +29,8 @@
Long Description:
-
-
+
+
{{#if isTermView}}
diff --git a/dashboardv3/public/css/scss/common.scss
b/dashboardv3/public/css/scss/common.scss
index c620838..9310e20 100644
--- a/dashboardv3/public/css/scss/common.scss
+++ b/dashboardv3/public/css/scss/common.scss
@@ -337,4 +337,10 @@ pre {
cursor: pointer;
}
}
+}
+
+.long-description {
+width: 85%;
+cursor: default !important;
+background-color: transparent !important;
}
\ No newline at end of file
diff --git
a/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
b/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
index 89ec57a..b69dac5 100644
---
a/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
+++
b/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
@@ -32,8 +32,8 @@
Long Description:
-
-
+
+
{{#if isTermView}}
[atlas] 01/02: ATLAS-4325:[Atlas: Glossary Term Bulk Import] [UI] Unable to perform bulk import glossary term via UI, fixed
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 ae3f655872c3a114ef1b38e2de77d270530e8db6
Author: prasad pawar
AuthorDate: Fri Jun 4 15:04:06 2021 +0530
ATLAS-4325:[Atlas: Glossary Term Bulk Import] [UI] Unable to perform bulk
import glossary term via UI, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/import/ImportLayoutView.js | 2 +-
dashboardv3/public/js/views/import/ImportLayoutView.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/import/ImportLayoutView.js
b/dashboardv2/public/js/views/import/ImportLayoutView.js
index 88d553c..27440bb 100644
--- a/dashboardv2/public/js/views/import/ImportLayoutView.js
+++ b/dashboardv2/public/js/views/import/ImportLayoutView.js
@@ -91,7 +91,7 @@ define([
}
}
var headers = {};
-headers[CommonViewFunction.restCsrfCustomHeader] = '""';
+headers[CommonViewFunction.restCsrfCustomHeader] =
CommonViewFunction.restCsrfValue || '""';
this.ui.importGlossary.dropzone({
url: that.isGlossary ? UrlLinks.glossaryImportUrl() :
UrlLinks.businessMetadataImportUrl(),
clickable: true,
diff --git a/dashboardv3/public/js/views/import/ImportLayoutView.js
b/dashboardv3/public/js/views/import/ImportLayoutView.js
index 88d553c..27440bb 100644
--- a/dashboardv3/public/js/views/import/ImportLayoutView.js
+++ b/dashboardv3/public/js/views/import/ImportLayoutView.js
@@ -91,7 +91,7 @@ define([
}
}
var headers = {};
-headers[CommonViewFunction.restCsrfCustomHeader] = '""';
+headers[CommonViewFunction.restCsrfCustomHeader] =
CommonViewFunction.restCsrfValue || '""';
this.ui.importGlossary.dropzone({
url: that.isGlossary ? UrlLinks.glossaryImportUrl() :
UrlLinks.businessMetadataImportUrl(),
clickable: true,
[atlas] branch master updated (005d867 -> f9d447d)
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 005d867 ATLAS-3812: Apache Flink model for Atlas. new ae3f655 ATLAS-4325:[Atlas: Glossary Term Bulk Import] [UI] Unable to perform bulk import glossary term via UI, fixed new f9d447d ATLAS-4294:Atlas UI : Format long description of Glossary term and category UI, fixed 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: dashboardv2/public/css/scss/common.scss | 6 ++ .../public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html | 4 ++-- dashboardv2/public/js/views/import/ImportLayoutView.js | 2 +- dashboardv3/public/css/scss/common.scss | 6 ++ .../public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html | 4 ++-- dashboardv3/public/js/views/import/ImportLayoutView.js | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-)
[atlas] 01/02: ATLAS-4302: Migrated Data: Process Entity Name not set to QualifiedName
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 3fcbf0e8531ce9b01071c2e0582a4c290c7dd81c
Author: Ashutosh Mestry
AuthorDate: Thu Jun 3 21:44:14 2021 -0700
ATLAS-4302: Migrated Data: Process Entity Name not set to QualifiedName
Signed-off-by: nixonrodrigues
(cherry picked from commit ef43a55fccf60bafd1ce1a5c0f2565d6da0e0620)
---
.../java/org/apache/atlas/AtlasConfiguration.java | 1 +
.../repository/patches/AtlasPatchManager.java | 1 +
.../atlas/repository/patches/ProcessNamePatch.java | 136 +
3 files changed, 138 insertions(+)
diff --git a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
index e31afa8..9ef8487 100644
--- a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
+++ b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
@@ -75,6 +75,7 @@ public enum AtlasConfiguration {
HTTP_HEADER_SERVER_VALUE("atlas.http.header.server.value","Apache Atlas"),
STORAGE_CONSISTENCY_LOCK_ENABLED("atlas.graph.storage.consistency-lock.enabled",
true),
REBUILD_INDEX("atlas.rebuild.index", false),
+PROCESS_NAME_UPDATE_PATCH("atlas.process.name.update.patch", false),
STORE_DIFFERENTIAL_AUDITS("atlas.entity.audit.differential", false),
DSL_EXECUTOR_TRAVERSAL("atlas.dsl.executor.traversal", true),
DEBUG_METRICS_ENABLED("atlas.debug.metrics.enabled", false),
diff --git
a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
index fae28c4..e2a38ab 100644
---
a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
+++
b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
@@ -59,6 +59,7 @@ public class AtlasPatchManager {
handlers.add(new SuggestionsRequestHandlerPatch(context));
handlers.add(new IndexConsistencyPatch(context));
handlers.add(new ReIndexPatch(context));
+handlers.add(new ProcessNamePatch(context));
LOG.info("<== AtlasPatchManager.init()");
}
diff --git
a/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
b/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
new file mode 100644
index 000..2efb747
--- /dev/null
+++
b/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
@@ -0,0 +1,136 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.atlas.repository.patches;
+
+import org.apache.atlas.AtlasConfiguration;
+import org.apache.atlas.exception.AtlasBaseException;
+import org.apache.atlas.model.instance.AtlasEntity;
+import org.apache.atlas.model.typedef.AtlasStructDef.AtlasAttributeDef;
+import org.apache.atlas.pc.WorkItemManager;
+import org.apache.atlas.repository.Constants;
+import org.apache.atlas.repository.IndexException;
+import org.apache.atlas.repository.graph.GraphBackedSearchIndexer.UniqueKind;
+import org.apache.atlas.repository.graphdb.AtlasCardinality;
+import org.apache.atlas.repository.graphdb.AtlasGraph;
+import org.apache.atlas.repository.graphdb.AtlasGraphManagement;
+import org.apache.atlas.repository.graphdb.AtlasSchemaViolationException;
+import org.apache.atlas.repository.graphdb.AtlasVertex;
+import org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2;
+import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
+import org.apache.atlas.type.AtlasEntityType;
+import org.apache.atlas.type.AtlasStructType.AtlasAttribute;
+import org.apache.atlas.type.AtlasTypeRegistry;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import static org.apache.atlas.model.patches.AtlasPatch.PatchStatus.APPLIED;
+import static
org.a
[atlas] 02/02: ATLAS-3812: Apache Flink model for Atlas.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit a873395618e0c561c4ba9d4369b4f1ad8d05f2e9
Author: Josh Yeh
AuthorDate: Thu Jun 3 21:41:34 2021 -0700
ATLAS-3812: Apache Flink model for Atlas.
Signed-off-by: nixonrodrigues
(cherry picked from commit 005d8674e09338504278440658af3159c8e5a967)
---
addons/models/1000-Hadoop/1110-flink_model.json | 106
1 file changed, 106 insertions(+)
diff --git a/addons/models/1000-Hadoop/1110-flink_model.json
b/addons/models/1000-Hadoop/1110-flink_model.json
new file mode 100644
index 000..029600f
--- /dev/null
+++ b/addons/models/1000-Hadoop/1110-flink_model.json
@@ -0,0 +1,106 @@
+{
+ "entityDefs": [
+{
+ "name": "flink_application",
+ "superTypes": [
+"Process"
+ ],
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "attributeDefs": [
+{
+ "name": "id",
+ "typeName": "string",
+ "cardinality": "SINGLE",
+ "isIndexable": true,
+ "isOptional": false,
+ "isUnique": true
+},
+{
+ "name": "startTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+},
+{
+ "name": "endTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+},
+{
+ "name": "conf",
+ "typeName": "map",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+}
+ ]
+},
+{
+ "name": "flink_process",
+ "superTypes": [
+"Process"
+ ],
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "attributeDefs": [
+{
+ "name": "id",
+ "typeName": "string",
+ "cardinality": "SINGLE",
+ "isIndexable": true,
+ "isOptional": false,
+ "isUnique": true
+},
+{
+ "name": "startTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+},
+{
+ "name": "endTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+},
+{
+ "name": "conf",
+ "typeName": "map",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+}
+ ]
+},
+{
+ "name": "flink_application_processes",
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "relationshipCategory": "AGGREGATION",
+ "endDef1": {
+"type": "flink_application",
+"name": "processes",
+"cardinality": "SET",
+"isContainer": true
+ },
+ "endDef2": {
+"type": "flink_process",
+"name": "application",
+"cardinality": "SINGLE"
+ },
+ "propagateTags": "NONE"
+}
+ ]
+}'
\ No newline at end of file
[atlas] branch branch-2.0 updated (0f20630 -> a873395)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from 0f20630 ATLAS-4318 : Remove useless pass statement in python client (#133) new 3fcbf0e ATLAS-4302: Migrated Data: Process Entity Name not set to QualifiedName new a873395 ATLAS-3812: Apache Flink model for Atlas. 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: addons/models/1000-Hadoop/1110-flink_model.json| 106 .../java/org/apache/atlas/AtlasConfiguration.java | 1 + .../repository/patches/AtlasPatchManager.java | 1 + .../atlas/repository/patches/ProcessNamePatch.java | 136 + 4 files changed, 244 insertions(+) create mode 100644 addons/models/1000-Hadoop/1110-flink_model.json create mode 100644 repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
[atlas] branch master updated (f96a653 -> 005d867)
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 f96a653 ATLAS-4318 : Remove unnecessary imports from python script (#134) new ef43a55 ATLAS-4302: Migrated Data: Process Entity Name not set to QualifiedName new 005d867 ATLAS-3812: Apache Flink model for Atlas. 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: addons/models/1000-Hadoop/1110-flink_model.json| 106 .../java/org/apache/atlas/AtlasConfiguration.java | 1 + .../repository/patches/AtlasPatchManager.java | 1 + .../atlas/repository/patches/ProcessNamePatch.java | 136 + 4 files changed, 244 insertions(+) create mode 100644 addons/models/1000-Hadoop/1110-flink_model.json create mode 100644 repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
[atlas] 02/02: ATLAS-3812: Apache Flink model for Atlas.
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 005d8674e09338504278440658af3159c8e5a967
Author: Josh Yeh
AuthorDate: Thu Jun 3 21:41:34 2021 -0700
ATLAS-3812: Apache Flink model for Atlas.
Signed-off-by: nixonrodrigues
---
addons/models/1000-Hadoop/1110-flink_model.json | 106
1 file changed, 106 insertions(+)
diff --git a/addons/models/1000-Hadoop/1110-flink_model.json
b/addons/models/1000-Hadoop/1110-flink_model.json
new file mode 100644
index 000..029600f
--- /dev/null
+++ b/addons/models/1000-Hadoop/1110-flink_model.json
@@ -0,0 +1,106 @@
+{
+ "entityDefs": [
+{
+ "name": "flink_application",
+ "superTypes": [
+"Process"
+ ],
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "attributeDefs": [
+{
+ "name": "id",
+ "typeName": "string",
+ "cardinality": "SINGLE",
+ "isIndexable": true,
+ "isOptional": false,
+ "isUnique": true
+},
+{
+ "name": "startTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+},
+{
+ "name": "endTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+},
+{
+ "name": "conf",
+ "typeName": "map",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+}
+ ]
+},
+{
+ "name": "flink_process",
+ "superTypes": [
+"Process"
+ ],
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "attributeDefs": [
+{
+ "name": "id",
+ "typeName": "string",
+ "cardinality": "SINGLE",
+ "isIndexable": true,
+ "isOptional": false,
+ "isUnique": true
+},
+{
+ "name": "startTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+},
+{
+ "name": "endTime",
+ "typeName": "date",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+},
+{
+ "name": "conf",
+ "typeName": "map",
+ "cardinality": "SINGLE",
+ "isIndexable": false,
+ "isOptional": true,
+ "isUnique": false
+}
+ ]
+},
+{
+ "name": "flink_application_processes",
+ "serviceType": "flink",
+ "typeVersion": "1.0",
+ "relationshipCategory": "AGGREGATION",
+ "endDef1": {
+"type": "flink_application",
+"name": "processes",
+"cardinality": "SET",
+"isContainer": true
+ },
+ "endDef2": {
+"type": "flink_process",
+"name": "application",
+"cardinality": "SINGLE"
+ },
+ "propagateTags": "NONE"
+}
+ ]
+}'
\ No newline at end of file
[atlas] 01/02: ATLAS-4302: Migrated Data: Process Entity Name not set to QualifiedName
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 ef43a55fccf60bafd1ce1a5c0f2565d6da0e0620
Author: Ashutosh Mestry
AuthorDate: Thu Jun 3 21:44:14 2021 -0700
ATLAS-4302: Migrated Data: Process Entity Name not set to QualifiedName
Signed-off-by: nixonrodrigues
---
.../java/org/apache/atlas/AtlasConfiguration.java | 1 +
.../repository/patches/AtlasPatchManager.java | 1 +
.../atlas/repository/patches/ProcessNamePatch.java | 136 +
3 files changed, 138 insertions(+)
diff --git a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
index e31afa8..9ef8487 100644
--- a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
+++ b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
@@ -75,6 +75,7 @@ public enum AtlasConfiguration {
HTTP_HEADER_SERVER_VALUE("atlas.http.header.server.value","Apache Atlas"),
STORAGE_CONSISTENCY_LOCK_ENABLED("atlas.graph.storage.consistency-lock.enabled",
true),
REBUILD_INDEX("atlas.rebuild.index", false),
+PROCESS_NAME_UPDATE_PATCH("atlas.process.name.update.patch", false),
STORE_DIFFERENTIAL_AUDITS("atlas.entity.audit.differential", false),
DSL_EXECUTOR_TRAVERSAL("atlas.dsl.executor.traversal", true),
DEBUG_METRICS_ENABLED("atlas.debug.metrics.enabled", false),
diff --git
a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
index fae28c4..e2a38ab 100644
---
a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
+++
b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchManager.java
@@ -59,6 +59,7 @@ public class AtlasPatchManager {
handlers.add(new SuggestionsRequestHandlerPatch(context));
handlers.add(new IndexConsistencyPatch(context));
handlers.add(new ReIndexPatch(context));
+handlers.add(new ProcessNamePatch(context));
LOG.info("<== AtlasPatchManager.init()");
}
diff --git
a/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
b/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
new file mode 100644
index 000..2efb747
--- /dev/null
+++
b/repository/src/main/java/org/apache/atlas/repository/patches/ProcessNamePatch.java
@@ -0,0 +1,136 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.atlas.repository.patches;
+
+import org.apache.atlas.AtlasConfiguration;
+import org.apache.atlas.exception.AtlasBaseException;
+import org.apache.atlas.model.instance.AtlasEntity;
+import org.apache.atlas.model.typedef.AtlasStructDef.AtlasAttributeDef;
+import org.apache.atlas.pc.WorkItemManager;
+import org.apache.atlas.repository.Constants;
+import org.apache.atlas.repository.IndexException;
+import org.apache.atlas.repository.graph.GraphBackedSearchIndexer.UniqueKind;
+import org.apache.atlas.repository.graphdb.AtlasCardinality;
+import org.apache.atlas.repository.graphdb.AtlasGraph;
+import org.apache.atlas.repository.graphdb.AtlasGraphManagement;
+import org.apache.atlas.repository.graphdb.AtlasSchemaViolationException;
+import org.apache.atlas.repository.graphdb.AtlasVertex;
+import org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2;
+import org.apache.atlas.repository.store.graph.v2.EntityGraphRetriever;
+import org.apache.atlas.type.AtlasEntityType;
+import org.apache.atlas.type.AtlasStructType.AtlasAttribute;
+import org.apache.atlas.type.AtlasTypeRegistry;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import static org.apache.atlas.model.patches.AtlasPatch.PatchStatus.APPLIED;
+import static
org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2.getIdFromVertex;
+
+public c
[atlas] branch branch-2.0 updated: ATLAS-4318 : Remove useless pass statement in python client (#133)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git The following commit(s) were added to refs/heads/branch-2.0 by this push: new 0f20630 ATLAS-4318 : Remove useless pass statement in python client (#133) 0f20630 is described below commit 0f2063088e297ae6d9efad27d77042a057010cbd Author: Benedict Jin AuthorDate: Thu Jun 3 11:27:37 2021 +0800 ATLAS-4318 : Remove useless pass statement in python client (#133) (cherry picked from commit 6d8718483f9ef60906addd7c2bb94785039986ac) --- distro/src/bin/atlas_config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 80b3bfb..493a34a 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -165,7 +165,6 @@ def expandWebApp(dir): except OSError as e: if e.errno != errno.EEXIST: raise e -pass atlasWarPath = os.path.join(atlasDir(), "server", "webapp", "atlas.war") if (isCygwin()): atlasWarPath = convertCygwinPath(atlasWarPath)
[atlas] branch branch-2.0 updated: ATLAS-4318 : Remove unnecessary imports from python script (#134)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git The following commit(s) were added to refs/heads/branch-2.0 by this push: new 6336faf ATLAS-4318 : Remove unnecessary imports from python script (#134) 6336faf is described below commit 6336faf3368b553c257c76e89552939b4fa5cb1a Author: Benedict Jin AuthorDate: Fri Jun 4 13:41:30 2021 +0800 ATLAS-4318 : Remove unnecessary imports from python script (#134) (cherry picked from commit f96a6530c09a83e4f0d6613e558c4e2e5d5f236a) --- atlas-examples/sample-app/src/main/python/entity_example.py | 2 +- distro/src/bin/atlas_admin.py | 2 +- distro/src/bin/atlas_update_simple_auth_json.py | 2 +- distro/src/bin/quick_start.py | 2 +- distro/src/bin/quick_start_v1.py| 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atlas-examples/sample-app/src/main/python/entity_example.py b/atlas-examples/sample-app/src/main/python/entity_example.py index b08b675..cb2d98d 100644 --- a/atlas-examples/sample-app/src/main/python/entity_example.py +++ b/atlas-examples/sample-app/src/main/python/entity_example.py @@ -21,7 +21,7 @@ import json import logging from apache_atlas.model.enumsimport EntityOperation -from apache_atlas.model.instance import AtlasEntityWithExtInfo, EntityMutations, AtlasRelatedObjectId +from apache_atlas.model.instance import AtlasEntityWithExtInfo, AtlasRelatedObjectId from apache_atlas.utils import type_coerce diff --git a/distro/src/bin/atlas_admin.py b/distro/src/bin/atlas_admin.py index da9a2fb..795a571 100644 --- a/distro/src/bin/atlas_admin.py +++ b/distro/src/bin/atlas_admin.py @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import os + import sys import atlas_config as mc diff --git a/distro/src/bin/atlas_update_simple_auth_json.py b/distro/src/bin/atlas_update_simple_auth_json.py index 6ad5a49..11c249d 100755 --- a/distro/src/bin/atlas_update_simple_auth_json.py +++ b/distro/src/bin/atlas_update_simple_auth_json.py @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import os + import sys import atlas_config as mc diff --git a/distro/src/bin/quick_start.py b/distro/src/bin/quick_start.py index c375122..78517f8 100755 --- a/distro/src/bin/quick_start.py +++ b/distro/src/bin/quick_start.py @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import os + import sys import atlas_config as mc diff --git a/distro/src/bin/quick_start_v1.py b/distro/src/bin/quick_start_v1.py index 0dca7d7..1c5775a 100755 --- a/distro/src/bin/quick_start_v1.py +++ b/distro/src/bin/quick_start_v1.py @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import os + import sys import atlas_config as mc
[atlas] branch master updated: ATLAS-4318 : Remove unnecessary imports from python script (#134)
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 f96a653 ATLAS-4318 : Remove unnecessary imports from python script (#134) f96a653 is described below commit f96a6530c09a83e4f0d6613e558c4e2e5d5f236a Author: Benedict Jin AuthorDate: Fri Jun 4 13:41:30 2021 +0800 ATLAS-4318 : Remove unnecessary imports from python script (#134) --- atlas-examples/sample-app/src/main/python/entity_example.py | 2 +- distro/src/bin/atlas_admin.py | 2 +- distro/src/bin/atlas_update_simple_auth_json.py | 2 +- distro/src/bin/quick_start.py | 2 +- distro/src/bin/quick_start_v1.py| 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atlas-examples/sample-app/src/main/python/entity_example.py b/atlas-examples/sample-app/src/main/python/entity_example.py index b08b675..cb2d98d 100644 --- a/atlas-examples/sample-app/src/main/python/entity_example.py +++ b/atlas-examples/sample-app/src/main/python/entity_example.py @@ -21,7 +21,7 @@ import json import logging from apache_atlas.model.enumsimport EntityOperation -from apache_atlas.model.instance import AtlasEntityWithExtInfo, EntityMutations, AtlasRelatedObjectId +from apache_atlas.model.instance import AtlasEntityWithExtInfo, AtlasRelatedObjectId from apache_atlas.utils import type_coerce diff --git a/distro/src/bin/atlas_admin.py b/distro/src/bin/atlas_admin.py index da9a2fb..795a571 100644 --- a/distro/src/bin/atlas_admin.py +++ b/distro/src/bin/atlas_admin.py @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import os + import sys import atlas_config as mc diff --git a/distro/src/bin/atlas_update_simple_auth_json.py b/distro/src/bin/atlas_update_simple_auth_json.py index 6ad5a49..11c249d 100755 --- a/distro/src/bin/atlas_update_simple_auth_json.py +++ b/distro/src/bin/atlas_update_simple_auth_json.py @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import os + import sys import atlas_config as mc diff --git a/distro/src/bin/quick_start.py b/distro/src/bin/quick_start.py index c375122..78517f8 100755 --- a/distro/src/bin/quick_start.py +++ b/distro/src/bin/quick_start.py @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import os + import sys import atlas_config as mc diff --git a/distro/src/bin/quick_start_v1.py b/distro/src/bin/quick_start_v1.py index 0dca7d7..1c5775a 100755 --- a/distro/src/bin/quick_start_v1.py +++ b/distro/src/bin/quick_start_v1.py @@ -15,7 +15,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import os + import sys import atlas_config as mc
[atlas] branch master updated: ATLAS-4318 : Remove useless pass statement in python client (#133)
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 6d87184 ATLAS-4318 : Remove useless pass statement in python client (#133) 6d87184 is described below commit 6d8718483f9ef60906addd7c2bb94785039986ac Author: Benedict Jin AuthorDate: Thu Jun 3 11:27:37 2021 +0800 ATLAS-4318 : Remove useless pass statement in python client (#133) --- distro/src/bin/atlas_config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py index 80b3bfb..493a34a 100755 --- a/distro/src/bin/atlas_config.py +++ b/distro/src/bin/atlas_config.py @@ -165,7 +165,6 @@ def expandWebApp(dir): except OSError as e: if e.errno != errno.EEXIST: raise e -pass atlasWarPath = os.path.join(atlasDir(), "server", "webapp", "atlas.war") if (isCygwin()): atlasWarPath = convertCygwinPath(atlasWarPath)
[atlas] 05/05: ATLAS-4321 : Ignore files generated under webapp/overlays (#132)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git commit c3abfca7a0ea22e1e8389c6768abcf8ba61d7028 Author: Benedict Jin AuthorDate: Wed Jun 2 01:44:09 2021 +0800 ATLAS-4321 : Ignore files generated under webapp/overlays (#132) (cherry picked from commit 3356dfc5f847f607d8dddef4eddda0f642dc6c76) --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 0f2e7bc..a25f185 100755 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,6 @@ distro/solr/*.tgz # emacs files *# *~ + +# webapp +/webapp/overlays/
[atlas] branch branch-2.0 updated (35dd96e -> c3abfca)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from 35dd96e ATLAS-4315 - An entity when updated via REST api, is not reflected in debug metrics. new bf688aa ATLAS-4318 : fix python client api url concatenation (#130) new 625f223 ATLAS-4318 : Fixed bug in entity.py (#135) new 6e07c2e ATLAS-4319 : Code refactoring in kafka bridge #136 new 84bef09 ATLAS-4320: Fixing location uri for DB entities in QuickStartV2 (#131) new c3abfca ATLAS-4321 : Ignore files generated under webapp/overlays (#132) The 5 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: .gitignore | 3 +++ .../org/apache/atlas/kafka/bridge/KafkaBridge.java | 6 +++--- intg/src/main/python/apache_atlas/client/entity.py | 4 ++-- intg/src/main/python/apache_atlas/utils.py | 25 -- .../org/apache/atlas/examples/QuickStartV2.java| 2 +- 5 files changed, 28 insertions(+), 12 deletions(-)
[atlas] 04/05: ATLAS-4320: Fixing location uri for DB entities in QuickStartV2 (#131)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 84bef096304b30f0f0c01671a84cf64edaf6bb05
Author: shrutimantri
AuthorDate: Tue Jun 1 22:46:53 2021 +0530
ATLAS-4320: Fixing location uri for DB entities in QuickStartV2 (#131)
Co-authored-by: Shruti Mantri
(cherry picked from commit fac8349593a63a1578f9337712e4c1db055abcd8)
---
webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java
b/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java
index bc3efbe..5309d19 100755
--- a/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java
+++ b/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java
@@ -463,7 +463,7 @@ public class QuickStartV2 {
entity.setAttribute(REFERENCEABLE_ATTRIBUTE_NAME, name +
CLUSTER_SUFFIX);
entity.setAttribute("description", description);
entity.setAttribute("owner", owner);
-entity.setAttribute("locationuri", locationUri);
+entity.setAttribute("locationUri", locationUri);
entity.setAttribute("createTime", System.currentTimeMillis());
// set classifications
[atlas] 02/05: ATLAS-4318 : Fixed bug in entity.py (#135)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 625f223cbf013b3c008b48e99261f55bb83c7cda
Author: UnexpectedPineapple
<82814626+unexpectedpineap...@users.noreply.github.com>
AuthorDate: Tue Jun 1 15:56:27 2021 +0100
ATLAS-4318 : Fixed bug in entity.py (#135)
Co-authored-by: UnexpectedPineapple <>
(cherry picked from commit 8f1bd684e4168c4cf6f0f05a8cb64acb18c90a5b)
---
intg/src/main/python/apache_atlas/client/entity.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/intg/src/main/python/apache_atlas/client/entity.py
b/intg/src/main/python/apache_atlas/client/entity.py
index f48ab7d..14cb4ed 100644
--- a/intg/src/main/python/apache_atlas/client/entity.py
+++ b/intg/src/main/python/apache_atlas/client/entity.py
@@ -254,13 +254,13 @@ class EntityClient:
{query}), None, query_params)
def get_entity_headers(self, tag_update_start_time):
-query_params = {"tagUpdateStartTime", tag_update_start_time}
+query_params = {"tagUpdateStartTime": tag_update_start_time}
return self.client.call_api(EntityClient.GET_BULK_HEADERS,
AtlasEntityHeaders, query_params)
# Business attributes APIs
def add_or_update_business_attributes(self, entity_guid, is_overwrite,
business_attributes):
-query_params = {"isOverwrite", is_overwrite}
+query_params = {"isOverwrite": is_overwrite}
self.client.call_api(EntityClient.ADD_BUSINESS_ATTRIBUTE.format_path({'entity_guid':
entity_guid}), None,
query_params, business_attributes)
[atlas] 01/05: ATLAS-4318 : fix python client api url concatenation (#130)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit bf688aa126d0c8cda09912badd95e879420b0258
Author: Claudio Benfatto
AuthorDate: Tue Jun 1 16:52:22 2021 +0200
ATLAS-4318 : fix python client api url concatenation (#130)
(cherry picked from commit 4f74de1498ef9f191f2b6d21d963d6de6ca0c5f9)
---
intg/src/main/python/apache_atlas/utils.py | 25 +++--
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/intg/src/main/python/apache_atlas/utils.py
b/intg/src/main/python/apache_atlas/utils.py
index 8500293..01d0762 100644
--- a/intg/src/main/python/apache_atlas/utils.py
+++ b/intg/src/main/python/apache_atlas/utils.py
@@ -17,6 +17,7 @@
# limitations under the License.
import enum
import time
+from functools import reduce
BASE_URI = "api/atlas/"
APPLICATION_JSON = 'application/json'
@@ -118,16 +119,28 @@ class API:
self.consumes = consumes
self.produces = produces
+def multipart_urljoin(self, base_path, *path_elems):
+"""Join a base path and multiple context path elements. Handle single
+leading and trailing `/` characters transparently.
+
+Args:
+base_path (string): the base path or url (ie. `http://atlas/v2/`)
+*path_elems (string): multiple relative path elements (ie.
`/my/relative`, `/path`)
+
+Returns:
+string: the result of joining the base_path with the additional
path elements
+"""
+def urljoin_pair(left, right):
+return "/".join([left.rstrip('/'), right.strip('/')])
+
+return reduce(urljoin_pair, path_elems, base_path)
+
def format_path(self, params):
return API(self.path.format(**params), self.method,
self.expected_status, self.consumes, self.produces)
def format_path_with_params(self, *params):
-path = self.path
-
-for par in params:
-path += "/" + par
-
-return API(path, self.method, self.expected_status, self.consumes,
self.produces)
+request_path = self.multipart_urljoin(self.path, *params)
+return API(request_path, self.method, self.expected_status,
self.consumes, self.produces)
class HTTPMethod(enum.Enum):
[atlas] 03/05: ATLAS-4319 : Code refactoring in kafka bridge #136
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 6e07c2e4fd1b0c4acf28781d021a989dfdbcbc1c
Author: Benedict Jin
AuthorDate: Tue Jun 1 23:00:57 2021 +0800
ATLAS-4319 : Code refactoring in kafka bridge #136
(cherry picked from commit ab23b99c50ec355773da35da2af5a2c3d01c3cec)
---
.../src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
b/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
index bf74c67..f954824 100644
---
a/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
+++
b/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
@@ -70,7 +70,7 @@ public class KafkaBridge {
private static final String URI = "uri";
private static final String CLUSTERNAME =
"clusterName";
private static final String TOPIC = "topic";
-private static final String FORMAT_KAKFA_TOPIC_QUALIFIED_NAME = "%s@%s";
+private static final String FORMAT_KAFKA_TOPIC_QUALIFIED_NAME = "%s@%s";
private final List availableTopics;
private final StringmetadataNamespace;
@@ -255,7 +255,7 @@ public class KafkaBridge {
@VisibleForTesting
static String getTopicQualifiedName(String metadataNamespace, String
topic) {
-return String.format(FORMAT_KAKFA_TOPIC_QUALIFIED_NAME,
topic.toLowerCase(), metadataNamespace);
+return String.format(FORMAT_KAFKA_TOPIC_QUALIFIED_NAME,
topic.toLowerCase(), metadataNamespace);
}
private AtlasEntityWithExtInfo findTopicEntityInAtlas(String
topicQualifiedName) {
@@ -358,4 +358,4 @@ public class KafkaBridge {
entity.getRelationshipAttributes().clear();
}
}
-}
\ No newline at end of file
+}
[atlas] branch master updated: ATLAS-4321 : Ignore files generated under webapp/overlays (#132)
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 3356dfc ATLAS-4321 : Ignore files generated under webapp/overlays (#132) 3356dfc is described below commit 3356dfc5f847f607d8dddef4eddda0f642dc6c76 Author: Benedict Jin AuthorDate: Wed Jun 2 01:44:09 2021 +0800 ATLAS-4321 : Ignore files generated under webapp/overlays (#132) --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 0f2e7bc..a25f185 100755 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,6 @@ distro/solr/*.tgz # emacs files *# *~ + +# webapp +/webapp/overlays/
[atlas] branch master updated: ATLAS-4320: Fixing location uri for DB entities in QuickStartV2 (#131)
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 fac8349 ATLAS-4320: Fixing location uri for DB entities in
QuickStartV2 (#131)
fac8349 is described below
commit fac8349593a63a1578f9337712e4c1db055abcd8
Author: shrutimantri
AuthorDate: Tue Jun 1 22:46:53 2021 +0530
ATLAS-4320: Fixing location uri for DB entities in QuickStartV2 (#131)
Co-authored-by: Shruti Mantri
---
webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java
b/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java
index bc3efbe..5309d19 100755
--- a/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java
+++ b/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java
@@ -463,7 +463,7 @@ public class QuickStartV2 {
entity.setAttribute(REFERENCEABLE_ATTRIBUTE_NAME, name +
CLUSTER_SUFFIX);
entity.setAttribute("description", description);
entity.setAttribute("owner", owner);
-entity.setAttribute("locationuri", locationUri);
+entity.setAttribute("locationUri", locationUri);
entity.setAttribute("createTime", System.currentTimeMillis());
// set classifications
[atlas] branch master updated: ATLAS-4319 : Code refactoring in kafka bridge #136
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 ab23b99 ATLAS-4319 : Code refactoring in kafka bridge #136
ab23b99 is described below
commit ab23b99c50ec355773da35da2af5a2c3d01c3cec
Author: Benedict Jin
AuthorDate: Tue Jun 1 23:00:57 2021 +0800
ATLAS-4319 : Code refactoring in kafka bridge #136
---
.../src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
b/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
index bf74c67..f954824 100644
---
a/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
+++
b/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java
@@ -70,7 +70,7 @@ public class KafkaBridge {
private static final String URI = "uri";
private static final String CLUSTERNAME =
"clusterName";
private static final String TOPIC = "topic";
-private static final String FORMAT_KAKFA_TOPIC_QUALIFIED_NAME = "%s@%s";
+private static final String FORMAT_KAFKA_TOPIC_QUALIFIED_NAME = "%s@%s";
private final List availableTopics;
private final StringmetadataNamespace;
@@ -255,7 +255,7 @@ public class KafkaBridge {
@VisibleForTesting
static String getTopicQualifiedName(String metadataNamespace, String
topic) {
-return String.format(FORMAT_KAKFA_TOPIC_QUALIFIED_NAME,
topic.toLowerCase(), metadataNamespace);
+return String.format(FORMAT_KAFKA_TOPIC_QUALIFIED_NAME,
topic.toLowerCase(), metadataNamespace);
}
private AtlasEntityWithExtInfo findTopicEntityInAtlas(String
topicQualifiedName) {
@@ -358,4 +358,4 @@ public class KafkaBridge {
entity.getRelationshipAttributes().clear();
}
}
-}
\ No newline at end of file
+}
[atlas] branch master updated: ATLAS-4318 : Fixed bug in entity.py (#135)
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 8f1bd68 ATLAS-4318 : Fixed bug in entity.py (#135)
8f1bd68 is described below
commit 8f1bd684e4168c4cf6f0f05a8cb64acb18c90a5b
Author: UnexpectedPineapple
<82814626+unexpectedpineap...@users.noreply.github.com>
AuthorDate: Tue Jun 1 15:56:27 2021 +0100
ATLAS-4318 : Fixed bug in entity.py (#135)
Co-authored-by: UnexpectedPineapple <>
---
intg/src/main/python/apache_atlas/client/entity.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/intg/src/main/python/apache_atlas/client/entity.py
b/intg/src/main/python/apache_atlas/client/entity.py
index f48ab7d..14cb4ed 100644
--- a/intg/src/main/python/apache_atlas/client/entity.py
+++ b/intg/src/main/python/apache_atlas/client/entity.py
@@ -254,13 +254,13 @@ class EntityClient:
{query}), None, query_params)
def get_entity_headers(self, tag_update_start_time):
-query_params = {"tagUpdateStartTime", tag_update_start_time}
+query_params = {"tagUpdateStartTime": tag_update_start_time}
return self.client.call_api(EntityClient.GET_BULK_HEADERS,
AtlasEntityHeaders, query_params)
# Business attributes APIs
def add_or_update_business_attributes(self, entity_guid, is_overwrite,
business_attributes):
-query_params = {"isOverwrite", is_overwrite}
+query_params = {"isOverwrite": is_overwrite}
self.client.call_api(EntityClient.ADD_BUSINESS_ATTRIBUTE.format_path({'entity_guid':
entity_guid}), None,
query_params, business_attributes)
[atlas] branch master updated (6ced16b -> 4f74de1)
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 6ced16b ATLAS-4315 - An entity when updated via REST api, is not reflected in debug metrics. add 4f74de1 ATLAS-4318 : fix python client api url concatenation (#130) No new revisions were added by this update. Summary of changes: intg/src/main/python/apache_atlas/utils.py | 25 +++-- 1 file changed, 19 insertions(+), 6 deletions(-)
[atlas] branch master updated: ATLAS-4315 - An entity when updated via REST api, is not reflected in debug metrics.
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 6ced16b ATLAS-4315 - An entity when updated via REST api, is not
reflected in debug metrics.
6ced16b is described below
commit 6ced16be4cc8c367a16fdfea3a11185c5a3206ef
Author: mayanknj
AuthorDate: Mon May 31 20:48:42 2021 +0530
ATLAS-4315 - An entity when updated via REST api, is not reflected in debug
metrics.
Signed-off-by: nixonrodrigues
---
.../org/apache/atlas/web/service/AtlasDebugMetricsSource.java | 10 ++
.../java/org/apache/atlas/web/service/DebugMetricsWrapper.java | 2 ++
2 files changed, 12 insertions(+)
diff --git
a/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSource.java
b/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSource.java
index ec64b01..63e979a 100644
---
a/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSource.java
+++
b/webapp/src/main/java/org/apache/atlas/web/service/AtlasDebugMetricsSource.java
@@ -41,7 +41,9 @@ public class AtlasDebugMetricsSource {
protected @Metric(always = true) MutableRate entityREST_getById;
protected @Metric(always = true) MutableRate entityREST_createOrUpdate;
+protected @Metric(always = true) MutableRate
entityREST_partialUpdateEntityAttrByGuid;
protected @Metric(always = true) MutableRate entityREST_deleteByGuid;
+protected @Metric(always = true) MutableRate entityREST_getClassification;
protected @Metric(always = true) MutableRate
entityREST_getClassifications;
protected @Metric(always = true) MutableRate
entityREST_addClassificationsByUniqAttr;
protected @Metric(always = true) MutableRate
entityREST_addClassifications;
@@ -583,10 +585,18 @@ public class AtlasDebugMetricsSource {
entityREST_createOrUpdate.add(timeConsumed);
break;
+case EntityREST_partialUpdateEntityAttrByGuid:
+entityREST_partialUpdateEntityAttrByGuid.add(timeConsumed);
+break;
+
case EntityREST_deleteByGuid:
entityREST_deleteByGuid.add(timeConsumed);
break;
+case EntityREST_getClassification:
+entityREST_getClassification.add(timeConsumed);
+break;
+
case EntityREST_getClassifications:
entityREST_getClassifications.add(timeConsumed);
break;
diff --git
a/webapp/src/main/java/org/apache/atlas/web/service/DebugMetricsWrapper.java
b/webapp/src/main/java/org/apache/atlas/web/service/DebugMetricsWrapper.java
index 564a946..0d2da1b 100644
--- a/webapp/src/main/java/org/apache/atlas/web/service/DebugMetricsWrapper.java
+++ b/webapp/src/main/java/org/apache/atlas/web/service/DebugMetricsWrapper.java
@@ -69,7 +69,9 @@ public class DebugMetricsWrapper {
public static final String EntityREST_getById
= EntityRESTPrefix + "getById(..)";
public static final String EntityREST_createOrUpdate
= EntityRESTPrefix + "createOrUpdate(..)";
+ public static final String
EntityREST_partialUpdateEntityAttrByGuid = EntityRESTPrefix +
"partialUpdateEntityAttrByGuid(..)";
public static final String EntityREST_deleteByGuid
= EntityRESTPrefix + "deleteByGuid(..)";
+ public static final String EntityREST_getClassification
= EntityRESTPrefix + "getClassification(..)";
public static final String EntityREST_getClassifications
= EntityRESTPrefix + "getClassifications(..)";
public static final String EntityREST_addClassificationsByUA
= EntityRESTPrefix + "addClassificationsByUniqueAttribute(..)";
public static final String EntityREST_addClassifications
= EntityRESTPrefix + "addClassifications(..)";
[atlas] 04/04: ATLAS-4308:ATLAS UI Audit sorting : When consecutive Entity Audits are fired, sorting happens on the previous sorted results received from the server, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 57e7cf61962d42aca5a1615d4c8e60709fd7d120
Author: prasad pawar
AuthorDate: Wed May 26 12:25:21 2021 +0530
ATLAS-4308:ATLAS UI Audit sorting : When consecutive Entity Audits are
fired, sorting happens on the previous sorted results received from the server,
fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/audit/AuditTableLayoutView.js | 9 +
dashboardv3/public/js/views/audit/AuditTableLayoutView.js | 8 +---
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
index d5e453c..625ae87 100644
--- a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
@@ -93,9 +93,6 @@ define(['require',
fetchAuditCollection: function() {
this.commonTableOptions['atlasPaginationOpts'] =
this.getPaginationOptions();
this.fetchCollection();
-this.entityCollection.comparator = function(model) {
-return -model.get('timestamp');
-}
},
bindEvents: function() {},
getPaginationOptions: function() {
@@ -118,9 +115,7 @@ define(['require',
this.entityCollection.fetch({
success: function(dataOrCollection, response) {
that.entityCollection.state.pageSize =
that.getPageCount();
-if (!that.fromSort) {
-
that.entityCollection.fullCollection.reset(response, $.extend(options));
-}
+that.entityCollection.reset(response,
$.extend(options));
},
complete: function() {
that.$('.fontLoader').hide();
@@ -128,7 +123,6 @@ define(['require',
that.$('.auditTable').show();
if (that.fromSort) {
that.fromSort = !that.fromSort;
-that.renderTableLayoutView();
}
},
silent: true
@@ -187,7 +181,6 @@ define(['require',
'views/audit/CreateAuditTableLayoutView',
], function(CreateAuditTableLayoutView) {
that.action = model.get('action');
-// $(el.target).attr('disabled', true);
var eventModel =
that.entityCollection.fullCollection.findWhere({ 'eventKey':
model.get('eventKey') }).toJSON(),
collectionModel = new
that.entityCollection.model(eventModel),
view = new CreateAuditTableLayoutView({
guid: that.guid, entityModel: collectionModel, action: that.action, entity:
that.entity, entityName: that.entityName, attributeDefs: that.attributeDefs });
diff --git a/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
index 49b84dd..625ae87 100644
--- a/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
@@ -93,9 +93,6 @@ define(['require',
fetchAuditCollection: function() {
this.commonTableOptions['atlasPaginationOpts'] =
this.getPaginationOptions();
this.fetchCollection();
-this.entityCollection.comparator = function(model) {
-return -model.get('timestamp');
-}
},
bindEvents: function() {},
getPaginationOptions: function() {
@@ -118,9 +115,7 @@ define(['require',
this.entityCollection.fetch({
success: function(dataOrCollection, response) {
that.entityCollection.state.pageSize =
that.getPageCount();
-if (!that.fromSort) {
-
that.entityCollection.fullCollection.reset(response, $.extend(options));
-}
+that.entityCollection.reset(response,
$.extend(options));
},
complete: function() {
that.$('.fontLoader').hide();
@@ -128,7 +123,6 @@ define(['require',
that.$('.auditTable').show();
if (that.fromSort) {
that.fromSort = !that.fromSort;
-that.renderTableLayoutView();
}
},
silent: true
[atlas] 02/04: ATLAS-4309:Atlas UI: After deleting the sub-classifications from Atlas UI, they still appear in UI, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 590f4914912a81d0ca4f0ba025013095a92e8f80
Author: prasad pawar
AuthorDate: Wed May 26 18:49:47 2021 +0530
ATLAS-4309:Atlas UI: After deleting the sub-classifications from Atlas UI,
they still appear in UI, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/tag/TagLayoutView.js | 12 +++-
.../js/views/search/tree/ClassificationTreeLayoutView.js | 15 ---
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index bde61b8..f408469 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -616,13 +616,23 @@ define(['require',
},
onNotifyOk: function(data) {
var that = this,
-deleteTagData = this.collection.fullCollection.findWhere({
name: this.tag });
+deleteTagData = this.collection.fullCollection.findWhere({
name: this.tag }),
+superTypeOfDeleteTag = deleteTagData.get('superTypes'),
+superTypeObj = superTypeOfDeleteTag ?
this.collection.fullCollection.findWhere({ name: superTypeOfDeleteTag[0] }) :
null;
+
deleteTagData.deleteTag({
typeName: that.tag,
success: function() {
Utils.notifySuccess({
content: "Classification " + that.tag +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
+//delete current classification from subTypes list of
parent classification if any
+if (superTypeObj) {
+var parentSubTypeUpdate =
_.reject(superTypeObj.get('subTypes'), function(subtype) {
+return subtype === that.tag;
+});
+superTypeObj.set('subTypes', parentSubTypeUpdate);
+}
// if deleted tag is prviously searched then remove
that tag url from save state of tab.
var searchUrl =
Globals.saveApplicationState.tabState.searchUrl;
var urlObj =
Utils.getUrlState.getQueryParams(searchUrl);
diff --git
a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index b64b101..75e53cd 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -865,16 +865,25 @@ define([
if (this.tagId) {
var deleteTagData =
this.classificationDefCollection.fullCollection.findWhere({ guid: this.tagId });
if (deleteTagData) {
-var tagName = deleteTagData.get("name");
+var tagName = deleteTagData.get("name"),
+superTypeOfDeleteTag = deleteTagData.get('superTypes'),
+superTypeObj = superTypeOfDeleteTag ?
this.classificationDefCollection.fullCollection.findWhere({ name:
superTypeOfDeleteTag[0] }) : null;
deleteTagData.deleteTag({
typeName: tagName,
success: function() {
Utils.notifySuccess({
content: "Classification " + tagName +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
+//delete current classification from subTypes list
of parent classification if any
+if (superTypeObj) {
+var parentSubTypeUpdate =
_.reject(superTypeObj.get('subTypes'), function(subtype) {
+return subtype === tagName;
+});
+superTypeObj.set('subTypes',
parentSubTypeUpdate);
+}
// if deleted tag is prviously searched then
remove that tag url from save state of tab.
-var searchUrl =
Globals.saveApplicationState.tabState.searchUrl;
-var urlObj =
Utils.getUrlState.getQueryParams(searchUrl);
+var searchUrl =
Globals.saveApplicationState.tabState.searchUrl,
+urlObj =
Utils.getUrlState.getQueryParams(searchUrl);
that.classificationDefCollection.fullCollection.remove(deleteTagData);
[atlas] 03/04: ATLAS-4314:Atlas UI: Make Tasks tab default as hidden on entity detail page, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit a12f51710a5c61a506db75b11384935b2961a9da
Author: prasad pawar
AuthorDate: Thu May 27 09:15:02 2021 +0530
ATLAS-4314:Atlas UI: Make Tasks tab default as hidden on entity detail
page, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/utils/Globals.js | 2 +-
dashboardv3/public/js/utils/Globals.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/Globals.js
b/dashboardv2/public/js/utils/Globals.js
index 2e94e6b..b0dc5cd 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -48,7 +48,7 @@ define(["require"], function(require) {
Globals.isTimezoneFormatEnabled = true;
Globals.isDebugMetricsEnabled = false;
-Globals.isTasksEnabled = true;
+Globals.isTasksEnabled = false;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv3/public/js/utils/Globals.js
b/dashboardv3/public/js/utils/Globals.js
index 2e94e6b..b0dc5cd 100644
--- a/dashboardv3/public/js/utils/Globals.js
+++ b/dashboardv3/public/js/utils/Globals.js
@@ -48,7 +48,7 @@ define(["require"], function(require) {
Globals.isTimezoneFormatEnabled = true;
Globals.isDebugMetricsEnabled = false;
-Globals.isTasksEnabled = true;
+Globals.isTasksEnabled = false;
return Globals;
});
\ No newline at end of file
[atlas] branch branch-2.0 updated (4e0228a -> 57e7cf6)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from 4e0228a ATLAS-4310: Handled NPE for DELETE classification. new 2d93c9f ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta UI] Bulk Import Business Metadata/Glossary options overlap, fixed new 590f491 ATLAS-4309:Atlas UI: After deleting the sub-classifications from Atlas UI, they still appear in UI, fixed new a12f517 ATLAS-4314:Atlas UI: Make Tasks tab default as hidden on entity detail page, fixed new 57e7cf6 ATLAS-4308:ATLAS UI Audit sorting : When consecutive Entity Audits are fired, sorting happens on the previous sorted results received from the server, fixed The 4 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/css/scss/theme.scss| 5 + dashboardv2/public/js/templates/site/Header.html | 10 +- dashboardv2/public/js/utils/Globals.js| 2 +- dashboardv2/public/js/views/audit/AuditTableLayoutView.js | 9 + dashboardv2/public/js/views/tag/TagLayoutView.js | 12 +++- dashboardv3/public/js/utils/Globals.js| 2 +- dashboardv3/public/js/views/audit/AuditTableLayoutView.js | 8 +--- .../js/views/search/tree/ClassificationTreeLayoutView.js | 15 --- 8 files changed, 37 insertions(+), 26 deletions(-)
[atlas] 01/04: ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta UI] Bulk Import Business Metadata/Glossary options overlap, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 2d93c9f4f99ac21c39cb85f0488cce61b62e235e
Author: prasad pawar
AuthorDate: Wed May 26 01:17:31 2021 +0530
ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta UI] Bulk Import
Business Metadata/Glossary options overlap, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/css/scss/theme.scss | 5 +
dashboardv2/public/js/templates/site/Header.html | 10 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dashboardv2/public/css/scss/theme.scss
b/dashboardv2/public/css/scss/theme.scss
index 045a461..4838ca3 100644
--- a/dashboardv2/public/css/scss/theme.scss
+++ b/dashboardv2/public/css/scss/theme.scss
@@ -577,6 +577,11 @@ hr[size="10"] {
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px;
border-radius: 0 6px 6px 6px;
+
+.submenu {
+left: -125%;
+top: -5px;
+}
}
&:hover>.dropdown-menu {
diff --git a/dashboardv2/public/js/templates/site/Header.html
b/dashboardv2/public/js/templates/site/Header.html
index 981f393..572e39e 100644
--- a/dashboardv2/public/js/templates/site/Header.html
+++ b/dashboardv2/public/js/templates/site/Header.html
@@ -45,14 +45,14 @@
Business Metadata
-
+
Download Import template
Import Business
Metadata
Glossary
-
+
Download Import template
Import Glossary
Term
@@ -66,8 +66,8 @@
API Documentation
About
{{#if isDebugMetricsEnabled}}
-Debug
-{{/if}}
+Debug
+{{/if}}
@@ -82,4 +82,4 @@
-
+
\ No newline at end of file
[atlas] 04/04: ATLAS-4308:ATLAS UI Audit sorting : When consecutive Entity Audits are fired, sorting happens on the previous sorted results received from the server, fixed
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 a098068614bac0902eb8ccc8ce297f3ac1f580c1
Author: prasad pawar
AuthorDate: Wed May 26 12:25:21 2021 +0530
ATLAS-4308:ATLAS UI Audit sorting : When consecutive Entity Audits are
fired, sorting happens on the previous sorted results received from the server,
fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/audit/AuditTableLayoutView.js | 9 +
dashboardv3/public/js/views/audit/AuditTableLayoutView.js | 8 +---
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
index d5e453c..625ae87 100644
--- a/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AuditTableLayoutView.js
@@ -93,9 +93,6 @@ define(['require',
fetchAuditCollection: function() {
this.commonTableOptions['atlasPaginationOpts'] =
this.getPaginationOptions();
this.fetchCollection();
-this.entityCollection.comparator = function(model) {
-return -model.get('timestamp');
-}
},
bindEvents: function() {},
getPaginationOptions: function() {
@@ -118,9 +115,7 @@ define(['require',
this.entityCollection.fetch({
success: function(dataOrCollection, response) {
that.entityCollection.state.pageSize =
that.getPageCount();
-if (!that.fromSort) {
-
that.entityCollection.fullCollection.reset(response, $.extend(options));
-}
+that.entityCollection.reset(response,
$.extend(options));
},
complete: function() {
that.$('.fontLoader').hide();
@@ -128,7 +123,6 @@ define(['require',
that.$('.auditTable').show();
if (that.fromSort) {
that.fromSort = !that.fromSort;
-that.renderTableLayoutView();
}
},
silent: true
@@ -187,7 +181,6 @@ define(['require',
'views/audit/CreateAuditTableLayoutView',
], function(CreateAuditTableLayoutView) {
that.action = model.get('action');
-// $(el.target).attr('disabled', true);
var eventModel =
that.entityCollection.fullCollection.findWhere({ 'eventKey':
model.get('eventKey') }).toJSON(),
collectionModel = new
that.entityCollection.model(eventModel),
view = new CreateAuditTableLayoutView({
guid: that.guid, entityModel: collectionModel, action: that.action, entity:
that.entity, entityName: that.entityName, attributeDefs: that.attributeDefs });
diff --git a/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
index 49b84dd..625ae87 100644
--- a/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AuditTableLayoutView.js
@@ -93,9 +93,6 @@ define(['require',
fetchAuditCollection: function() {
this.commonTableOptions['atlasPaginationOpts'] =
this.getPaginationOptions();
this.fetchCollection();
-this.entityCollection.comparator = function(model) {
-return -model.get('timestamp');
-}
},
bindEvents: function() {},
getPaginationOptions: function() {
@@ -118,9 +115,7 @@ define(['require',
this.entityCollection.fetch({
success: function(dataOrCollection, response) {
that.entityCollection.state.pageSize =
that.getPageCount();
-if (!that.fromSort) {
-
that.entityCollection.fullCollection.reset(response, $.extend(options));
-}
+that.entityCollection.reset(response,
$.extend(options));
},
complete: function() {
that.$('.fontLoader').hide();
@@ -128,7 +123,6 @@ define(['require',
that.$('.auditTable').show();
if (that.fromSort) {
that.fromSort = !that.fromSort;
-that.renderTableLayoutView();
}
},
silent: true
[atlas] 02/04: ATLAS-4309:Atlas UI: After deleting the sub-classifications from Atlas UI, they still appear in UI, fixed
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 aa001dbf7c08c9de2bb9eae27ac0581b09b5c403
Author: prasad pawar
AuthorDate: Wed May 26 18:49:47 2021 +0530
ATLAS-4309:Atlas UI: After deleting the sub-classifications from Atlas UI,
they still appear in UI, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/tag/TagLayoutView.js | 12 +++-
.../js/views/search/tree/ClassificationTreeLayoutView.js | 15 ---
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index bde61b8..f408469 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -616,13 +616,23 @@ define(['require',
},
onNotifyOk: function(data) {
var that = this,
-deleteTagData = this.collection.fullCollection.findWhere({
name: this.tag });
+deleteTagData = this.collection.fullCollection.findWhere({
name: this.tag }),
+superTypeOfDeleteTag = deleteTagData.get('superTypes'),
+superTypeObj = superTypeOfDeleteTag ?
this.collection.fullCollection.findWhere({ name: superTypeOfDeleteTag[0] }) :
null;
+
deleteTagData.deleteTag({
typeName: that.tag,
success: function() {
Utils.notifySuccess({
content: "Classification " + that.tag +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
+//delete current classification from subTypes list of
parent classification if any
+if (superTypeObj) {
+var parentSubTypeUpdate =
_.reject(superTypeObj.get('subTypes'), function(subtype) {
+return subtype === that.tag;
+});
+superTypeObj.set('subTypes', parentSubTypeUpdate);
+}
// if deleted tag is prviously searched then remove
that tag url from save state of tab.
var searchUrl =
Globals.saveApplicationState.tabState.searchUrl;
var urlObj =
Utils.getUrlState.getQueryParams(searchUrl);
diff --git
a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index b64b101..75e53cd 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -865,16 +865,25 @@ define([
if (this.tagId) {
var deleteTagData =
this.classificationDefCollection.fullCollection.findWhere({ guid: this.tagId });
if (deleteTagData) {
-var tagName = deleteTagData.get("name");
+var tagName = deleteTagData.get("name"),
+superTypeOfDeleteTag = deleteTagData.get('superTypes'),
+superTypeObj = superTypeOfDeleteTag ?
this.classificationDefCollection.fullCollection.findWhere({ name:
superTypeOfDeleteTag[0] }) : null;
deleteTagData.deleteTag({
typeName: tagName,
success: function() {
Utils.notifySuccess({
content: "Classification " + tagName +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
+//delete current classification from subTypes list
of parent classification if any
+if (superTypeObj) {
+var parentSubTypeUpdate =
_.reject(superTypeObj.get('subTypes'), function(subtype) {
+return subtype === tagName;
+});
+superTypeObj.set('subTypes',
parentSubTypeUpdate);
+}
// if deleted tag is prviously searched then
remove that tag url from save state of tab.
-var searchUrl =
Globals.saveApplicationState.tabState.searchUrl;
-var urlObj =
Utils.getUrlState.getQueryParams(searchUrl);
+var searchUrl =
Globals.saveApplicationState.tabState.searchUrl,
+urlObj =
Utils.getUrlState.getQueryParams(searchUrl);
that.classificationDefCollection.fullCollection.remove(deleteTagData);
/
[atlas] 01/04: ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta UI] Bulk Import Business Metadata/Glossary options overlap, fixed
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 076904fa2bcbcc2b2e2563f7f6738ee10df2ffd4
Author: prasad pawar
AuthorDate: Wed May 26 01:17:31 2021 +0530
ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta UI] Bulk Import
Business Metadata/Glossary options overlap, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/css/scss/theme.scss | 5 +
dashboardv2/public/js/templates/site/Header.html | 10 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dashboardv2/public/css/scss/theme.scss
b/dashboardv2/public/css/scss/theme.scss
index 045a461..4838ca3 100644
--- a/dashboardv2/public/css/scss/theme.scss
+++ b/dashboardv2/public/css/scss/theme.scss
@@ -577,6 +577,11 @@ hr[size="10"] {
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px;
border-radius: 0 6px 6px 6px;
+
+.submenu {
+left: -125%;
+top: -5px;
+}
}
&:hover>.dropdown-menu {
diff --git a/dashboardv2/public/js/templates/site/Header.html
b/dashboardv2/public/js/templates/site/Header.html
index 981f393..572e39e 100644
--- a/dashboardv2/public/js/templates/site/Header.html
+++ b/dashboardv2/public/js/templates/site/Header.html
@@ -45,14 +45,14 @@
Business Metadata
-
+
Download Import template
Import Business
Metadata
Glossary
-
+
Download Import template
Import Glossary
Term
@@ -66,8 +66,8 @@
API Documentation
About
{{#if isDebugMetricsEnabled}}
-Debug
-{{/if}}
+Debug
+{{/if}}
@@ -82,4 +82,4 @@
-
+
\ No newline at end of file
[atlas] branch master updated (fd26e12 -> a098068)
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 fd26e12 ATLAS-4310: Handled NPE for DELETE classification. new 076904f ATLAS-4304:UI:[Business Metadata Bulk Import] [Beta UI] Bulk Import Business Metadata/Glossary options overlap, fixed new aa001db ATLAS-4309:Atlas UI: After deleting the sub-classifications from Atlas UI, they still appear in UI, fixed new 47cca6f ATLAS-4314:Atlas UI: Make Tasks tab default as hidden on entity detail page, fixed new a098068 ATLAS-4308:ATLAS UI Audit sorting : When consecutive Entity Audits are fired, sorting happens on the previous sorted results received from the server, fixed The 4 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/css/scss/theme.scss| 5 + dashboardv2/public/js/templates/site/Header.html | 10 +- dashboardv2/public/js/utils/Globals.js| 2 +- dashboardv2/public/js/views/audit/AuditTableLayoutView.js | 9 + dashboardv2/public/js/views/tag/TagLayoutView.js | 12 +++- dashboardv3/public/js/utils/Globals.js| 2 +- dashboardv3/public/js/views/audit/AuditTableLayoutView.js | 8 +--- .../js/views/search/tree/ClassificationTreeLayoutView.js | 15 --- 8 files changed, 37 insertions(+), 26 deletions(-)
[atlas] 03/04: ATLAS-4314:Atlas UI: Make Tasks tab default as hidden on entity detail page, fixed
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 47cca6fc1efb7b5c4158c0262f1ef2c434719f0a
Author: prasad pawar
AuthorDate: Thu May 27 09:15:02 2021 +0530
ATLAS-4314:Atlas UI: Make Tasks tab default as hidden on entity detail
page, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/utils/Globals.js | 2 +-
dashboardv3/public/js/utils/Globals.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/Globals.js
b/dashboardv2/public/js/utils/Globals.js
index 2e94e6b..b0dc5cd 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -48,7 +48,7 @@ define(["require"], function(require) {
Globals.isTimezoneFormatEnabled = true;
Globals.isDebugMetricsEnabled = false;
-Globals.isTasksEnabled = true;
+Globals.isTasksEnabled = false;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv3/public/js/utils/Globals.js
b/dashboardv3/public/js/utils/Globals.js
index 2e94e6b..b0dc5cd 100644
--- a/dashboardv3/public/js/utils/Globals.js
+++ b/dashboardv3/public/js/utils/Globals.js
@@ -48,7 +48,7 @@ define(["require"], function(require) {
Globals.isTimezoneFormatEnabled = true;
Globals.isDebugMetricsEnabled = false;
-Globals.isTasksEnabled = true;
+Globals.isTasksEnabled = false;
return Globals;
});
\ No newline at end of file
[atlas] 02/02: ATLAS-4281: Atlas UI: Tasks tab refresh button is seen on other tabs of entity detail page, fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 8dd75c3d99cf50add6a15d03529f378d041d86be
Author: prasad pawar
AuthorDate: Wed May 12 12:21:18 2021 +0530
ATLAS-4281: Atlas UI: Tasks tab refresh button is seen on other tabs of
entity detail page, fixed
Signed-off-by: nixonrodrigues
(cherry picked from commit bac159f46502233081bcdda1a75c9f71197b31dd)
---
dashboardv2/public/css/scss/tab.scss | 3 +--
dashboardv3/public/css/scss/tab.scss | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/css/scss/tab.scss
b/dashboardv2/public/css/scss/tab.scss
index 9c85587..c164b47 100644
--- a/dashboardv2/public/css/scss/tab.scss
+++ b/dashboardv2/public/css/scss/tab.scss
@@ -193,10 +193,9 @@ ul.tabs li.tab {
}
.pending-task {
-padding: 10px 20px 15px 20px !important;
.pending-refresh-btn {
-margin-bottom: 10px;
+margin-bottom: 15px;
}
table tr th {
diff --git a/dashboardv3/public/css/scss/tab.scss
b/dashboardv3/public/css/scss/tab.scss
index 9c85587..c164b47 100644
--- a/dashboardv3/public/css/scss/tab.scss
+++ b/dashboardv3/public/css/scss/tab.scss
@@ -193,10 +193,9 @@ ul.tabs li.tab {
}
.pending-task {
-padding: 10px 20px 15px 20px !important;
.pending-refresh-btn {
-margin-bottom: 10px;
+margin-bottom: 15px;
}
table tr th {
[atlas] 01/02: ATLAS-4280:UI:Save button is enabled when Classification description is updated with original value. fixed
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 3c9cbd5cd98455428ddaa56aca0604b68ab18b3a
Author: prasad pawar
AuthorDate: Wed May 12 12:33:17 2021 +0530
ATLAS-4280:UI:Save button is enabled when Classification description is
updated with original value. fixed
Signed-off-by: nixonrodrigues
(cherry picked from commit c0cf04f7ece4af3734d1285c4385b46f8e556020)
---
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 3 ++-
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
index 4c40389..9b8b90f 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -302,8 +302,9 @@ define(['require',
okText: 'Save',
allowCancel: true,
}).open();
-view.ui.description.on('keyup', function(e) {
+view.ui.description.on('keyup input', function(e) {
that.textAreaChangeEvent(view);
+e.stopPropagation();
});
that.modal.$el.find('button.ok').prop('disabled', true);
that.modal.on('ok', function() {
diff --git a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
index 20220f2..6e10155 100644
--- a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -306,8 +306,9 @@ define(['require',
okText: 'Save',
allowCancel: true,
}).open();
-view.ui.description.on('keyup', function(e) {
+view.ui.description.on('keyup input', function(e) {
that.textAreaChangeEvent(view);
+e.stopPropagation();
});
that.modal.$el.find('button.ok').prop('disabled', true);
that.modal.on('ok', function() {
[atlas] branch branch-2.0 updated (6f45f5f -> 8dd75c3)
This is an automated email from the ASF dual-hosted git repository. nixon pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from 6f45f5f ATLAS-4284: Hive pruned tables are ignored and not pruned new 3c9cbd5 ATLAS-4280:UI:Save button is enabled when Classification description is updated with original value. fixed new 8dd75c3 ATLAS-4281: Atlas UI: Tasks tab refresh button is seen on other tabs of entity detail page, fixed 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: dashboardv2/public/css/scss/tab.scss| 3 +-- dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 3 ++- dashboardv3/public/css/scss/tab.scss| 3 +-- dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-)
[atlas] 02/02: ATLAS-4280:UI:Save button is enabled when Classification description is updated with original value. fixed
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 c0cf04f7ece4af3734d1285c4385b46f8e556020
Author: prasad pawar
AuthorDate: Wed May 12 12:33:17 2021 +0530
ATLAS-4280:UI:Save button is enabled when Classification description is
updated with original value. fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 3 ++-
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
index 4c40389..9b8b90f 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -302,8 +302,9 @@ define(['require',
okText: 'Save',
allowCancel: true,
}).open();
-view.ui.description.on('keyup', function(e) {
+view.ui.description.on('keyup input', function(e) {
that.textAreaChangeEvent(view);
+e.stopPropagation();
});
that.modal.$el.find('button.ok').prop('disabled', true);
that.modal.on('ok', function() {
diff --git a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
index 20220f2..6e10155 100644
--- a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -306,8 +306,9 @@ define(['require',
okText: 'Save',
allowCancel: true,
}).open();
-view.ui.description.on('keyup', function(e) {
+view.ui.description.on('keyup input', function(e) {
that.textAreaChangeEvent(view);
+e.stopPropagation();
});
that.modal.$el.find('button.ok').prop('disabled', true);
that.modal.on('ok', function() {
[atlas] 01/02: ATLAS-4281: Atlas UI: Tasks tab refresh button is seen on other tabs of entity detail page, fixed
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 bac159f46502233081bcdda1a75c9f71197b31dd
Author: prasad pawar
AuthorDate: Wed May 12 12:21:18 2021 +0530
ATLAS-4281: Atlas UI: Tasks tab refresh button is seen on other tabs of
entity detail page, fixed
Signed-off-by: nixonrodrigues
---
dashboardv2/public/css/scss/tab.scss | 3 +--
dashboardv3/public/css/scss/tab.scss | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/css/scss/tab.scss
b/dashboardv2/public/css/scss/tab.scss
index 9c85587..c164b47 100644
--- a/dashboardv2/public/css/scss/tab.scss
+++ b/dashboardv2/public/css/scss/tab.scss
@@ -193,10 +193,9 @@ ul.tabs li.tab {
}
.pending-task {
-padding: 10px 20px 15px 20px !important;
.pending-refresh-btn {
-margin-bottom: 10px;
+margin-bottom: 15px;
}
table tr th {
diff --git a/dashboardv3/public/css/scss/tab.scss
b/dashboardv3/public/css/scss/tab.scss
index 9c85587..c164b47 100644
--- a/dashboardv3/public/css/scss/tab.scss
+++ b/dashboardv3/public/css/scss/tab.scss
@@ -193,10 +193,9 @@ ul.tabs li.tab {
}
.pending-task {
-padding: 10px 20px 15px 20px !important;
.pending-refresh-btn {
-margin-bottom: 10px;
+margin-bottom: 15px;
}
table tr th {
[atlas] branch master updated (81888a9 -> c0cf04f)
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 81888a9 ATLAS-4284: Hive pruned tables are ignored and not pruned new bac159f ATLAS-4281: Atlas UI: Tasks tab refresh button is seen on other tabs of entity detail page, fixed new c0cf04f ATLAS-4280:UI:Save button is enabled when Classification description is updated with original value. fixed 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: dashboardv2/public/css/scss/tab.scss| 3 +-- dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 3 ++- dashboardv3/public/css/scss/tab.scss| 3 +-- dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-)
[atlas] branch branch-2.0 updated: ATLAS-4278 - Deferred Actions : Deleting a tag after disassociating it from a table which propagated fails
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 4db7479 ATLAS-4278 - Deferred Actions : Deleting a tag after
disassociating it from a table which propagated fails
4db7479 is described below
commit 4db747954abbbf1f794465e0f69f31833fb2450a
Author: Jayendra Parab
AuthorDate: Sun May 9 17:45:26 2021 +0530
ATLAS-4278 - Deferred Actions : Deleting a tag after disassociating it from
a table which propagated fails
Signed-off-by: nixonrodrigues
(cherry picked from commit ed1c4854ba05093ac9484b2c96e284520414dfc3)
---
.../org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
index 02ba5ef..7984a34 100644
---
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
+++
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
@@ -2569,6 +2569,7 @@ public class EntityGraphMapper {
GraphTransactionInterceptor.lockObjectAndReleasePostCommit(entityGuid);
AtlasVertex classificationVertex =
graph.getVertex(classificationVertexId);
+AtlasClassification classification =
entityRetriever.toAtlasClassification(classificationVertex);
if (classificationVertex == null) {
LOG.warn("deleteClassificationPropagation(classificationVertexId={}):
classification vertex not found", classificationVertexId);
@@ -2578,12 +2579,13 @@ public class EntityGraphMapper {
List entityVertices =
deleteDelegate.getHandler().removeTagPropagation(classificationVertex);
+
deleteDelegate.getHandler().deleteClassificationVertex(classificationVertex,
true);
+
if (CollectionUtils.isEmpty(entityVertices)) {
return null;
}
-AtlasClassification classification =
entityRetriever.toAtlasClassification(classificationVertex);
List propagatedEntities =
updateClassificationText(classification, entityVertices);
entityChangeNotifier.onClassificationsDeletedFromEntities(propagatedEntities,
Collections.singletonList(classification));
[atlas] branch master updated: ATLAS-4278 - Deferred Actions : Deleting a tag after disassociating it from a table which propagated fails
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 ed1c485 ATLAS-4278 - Deferred Actions : Deleting a tag after
disassociating it from a table which propagated fails
ed1c485 is described below
commit ed1c4854ba05093ac9484b2c96e284520414dfc3
Author: Jayendra Parab
AuthorDate: Sun May 9 17:45:26 2021 +0530
ATLAS-4278 - Deferred Actions : Deleting a tag after disassociating it from
a table which propagated fails
Signed-off-by: nixonrodrigues
---
.../org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
index 02ba5ef..7984a34 100644
---
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
+++
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
@@ -2569,6 +2569,7 @@ public class EntityGraphMapper {
GraphTransactionInterceptor.lockObjectAndReleasePostCommit(entityGuid);
AtlasVertex classificationVertex =
graph.getVertex(classificationVertexId);
+AtlasClassification classification =
entityRetriever.toAtlasClassification(classificationVertex);
if (classificationVertex == null) {
LOG.warn("deleteClassificationPropagation(classificationVertexId={}):
classification vertex not found", classificationVertexId);
@@ -2578,12 +2579,13 @@ public class EntityGraphMapper {
List entityVertices =
deleteDelegate.getHandler().removeTagPropagation(classificationVertex);
+
deleteDelegate.getHandler().deleteClassificationVertex(classificationVertex,
true);
+
if (CollectionUtils.isEmpty(entityVertices)) {
return null;
}
-AtlasClassification classification =
entityRetriever.toAtlasClassification(classificationVertex);
List propagatedEntities =
updateClassificationText(classification, entityVertices);
entityChangeNotifier.onClassificationsDeletedFromEntities(propagatedEntities,
Collections.singletonList(classification));
[atlas] branch branch-2.0 updated: ATLAS-4279: Fixed IT failing for DebugMetricsIT.
This is an automated email from the ASF dual-hosted git repository. nixon pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git The following commit(s) were added to refs/heads/branch-2.0 by this push: new 5836369 ATLAS-4279: Fixed IT failing for DebugMetricsIT. 5836369 is described below commit 58363692dce2c9b344e34781ddd5888c54ea765c Author: Jayendra Parab AuthorDate: Mon May 10 12:28:31 2021 +0530 ATLAS-4279: Fixed IT failing for DebugMetricsIT. (cherry picked from commit efb0ee1df75ec0b03990c7e56feaa926314d9226) --- webapp/src/test/resources/atlas-application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/test/resources/atlas-application.properties b/webapp/src/test/resources/atlas-application.properties index adeade8..1d45e78 100644 --- a/webapp/src/test/resources/atlas-application.properties +++ b/webapp/src/test/resources/atlas-application.properties @@ -130,3 +130,4 @@ atlas.search.gremlin.enable=true # Configure use of Tasks # atlas.tasks.enabled=false +atlas.debug.metrics.enabled=true
[atlas] branch master updated: ATLAS-4279: Fixed IT failing for DebugMetricsIT.
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 efb0ee1 ATLAS-4279: Fixed IT failing for DebugMetricsIT. efb0ee1 is described below commit efb0ee1df75ec0b03990c7e56feaa926314d9226 Author: Jayendra Parab AuthorDate: Mon May 10 12:28:31 2021 +0530 ATLAS-4279: Fixed IT failing for DebugMetricsIT. --- webapp/src/test/resources/atlas-application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/test/resources/atlas-application.properties b/webapp/src/test/resources/atlas-application.properties index adeade8..1d45e78 100644 --- a/webapp/src/test/resources/atlas-application.properties +++ b/webapp/src/test/resources/atlas-application.properties @@ -130,3 +130,4 @@ atlas.search.gremlin.enable=true # Configure use of Tasks # atlas.tasks.enabled=false +atlas.debug.metrics.enabled=true
[atlas] branch branch-2.0 updated: ATLAS-4243:UI: Legend in lineage gets duplicated.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 349c142 ATLAS-4243:UI: Legend in lineage gets duplicated.
349c142 is described below
commit 349c14236f72bc5a2066de7162dad3d445d942ea
Author: prasad pawar
AuthorDate: Tue Apr 27 12:21:11 2021 +0530
ATLAS-4243:UI: Legend in lineage gets duplicated.
Signed-off-by: nixonrodrigues
(cherry picked from commit 7605f7a6aee531ec82637edb2eec0aad3d24dc85)
---
dashboardv2/public/js/views/graph/LineageLayoutView.js | 6 --
dashboardv3/public/js/views/graph/LineageLayoutView.js | 7 ---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js
b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index bf80509..5ad657e 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -215,7 +215,8 @@ define(['require',
onSelectDepthChange: function(e, options) {
//this.initializeGraph();
this.filterObj.depthCount = e.currentTarget.value;
-this.fetchGraphData({ queryParam: { 'depth':
this.filterObj.depthCount } });
+//legends property is added in queryParam to stop the legend
getting added in lineage graph whenever dept is changed.
+this.fetchGraphData({ queryParam: { 'depth':
this.filterObj.depthCount }, 'legends': false });
},
onClickResetLineage: function() {
this.LineageHelperRef.refresh();
@@ -252,7 +253,7 @@ define(['require',
if (that.isDestroyed) {
return;
}
-
+data["legends"] = options ? options.legends : true;
that.createGraph(data);
that.renderLineageTypeSearch(data);
},
@@ -274,6 +275,7 @@ define(['require',
data: data,
el: this.$('.svg')[0],
legendsEl: this.$('.legends')[0],
+legends: data.legends,
getFilterObj: function() {
return {
isProcessHideCheck:
that.filterObj.isProcessHideCheck,
diff --git a/dashboardv3/public/js/views/graph/LineageLayoutView.js
b/dashboardv3/public/js/views/graph/LineageLayoutView.js
index bf80509..954d9af 100644
--- a/dashboardv3/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv3/public/js/views/graph/LineageLayoutView.js
@@ -215,7 +215,8 @@ define(['require',
onSelectDepthChange: function(e, options) {
//this.initializeGraph();
this.filterObj.depthCount = e.currentTarget.value;
-this.fetchGraphData({ queryParam: { 'depth':
this.filterObj.depthCount } });
+//legends property is added in queryParam to stop the legend
getting added in lineage graph whenever dept is changed.
+this.fetchGraphData({ queryParam: { 'depth':
this.filterObj.depthCount }, 'legends': false });
},
onClickResetLineage: function() {
this.LineageHelperRef.refresh();
@@ -252,7 +253,7 @@ define(['require',
if (that.isDestroyed) {
return;
}
-
+data["legends"] = options ? options.legends : true;
that.createGraph(data);
that.renderLineageTypeSearch(data);
},
@@ -268,12 +269,12 @@ define(['require',
createGraph: function(data) {
var that = this;
$('.resizeGraph').css("height", this.$('.svg').height() +
"px");
-
this.LineageHelperRef = new LineageHelper.default({
entityDefCollection:
this.entityDefCollection.fullCollection.toJSON(),
data: data,
el: this.$('.svg')[0],
legendsEl: this.$('.legends')[0],
+legends: data.legends,
getFilterObj: function() {
return {
isProcessHideCheck:
that.filterObj.isProcessHideCheck,
[atlas] branch master updated: ATLAS-4243:UI: Legend in lineage gets duplicated.
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 7605f7a ATLAS-4243:UI: Legend in lineage gets duplicated.
7605f7a is described below
commit 7605f7a6aee531ec82637edb2eec0aad3d24dc85
Author: prasad pawar
AuthorDate: Tue Apr 27 12:21:11 2021 +0530
ATLAS-4243:UI: Legend in lineage gets duplicated.
Signed-off-by: nixonrodrigues
---
dashboardv2/public/js/views/graph/LineageLayoutView.js | 6 --
dashboardv3/public/js/views/graph/LineageLayoutView.js | 7 ---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js
b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index bf80509..5ad657e 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -215,7 +215,8 @@ define(['require',
onSelectDepthChange: function(e, options) {
//this.initializeGraph();
this.filterObj.depthCount = e.currentTarget.value;
-this.fetchGraphData({ queryParam: { 'depth':
this.filterObj.depthCount } });
+//legends property is added in queryParam to stop the legend
getting added in lineage graph whenever dept is changed.
+this.fetchGraphData({ queryParam: { 'depth':
this.filterObj.depthCount }, 'legends': false });
},
onClickResetLineage: function() {
this.LineageHelperRef.refresh();
@@ -252,7 +253,7 @@ define(['require',
if (that.isDestroyed) {
return;
}
-
+data["legends"] = options ? options.legends : true;
that.createGraph(data);
that.renderLineageTypeSearch(data);
},
@@ -274,6 +275,7 @@ define(['require',
data: data,
el: this.$('.svg')[0],
legendsEl: this.$('.legends')[0],
+legends: data.legends,
getFilterObj: function() {
return {
isProcessHideCheck:
that.filterObj.isProcessHideCheck,
diff --git a/dashboardv3/public/js/views/graph/LineageLayoutView.js
b/dashboardv3/public/js/views/graph/LineageLayoutView.js
index bf80509..954d9af 100644
--- a/dashboardv3/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv3/public/js/views/graph/LineageLayoutView.js
@@ -215,7 +215,8 @@ define(['require',
onSelectDepthChange: function(e, options) {
//this.initializeGraph();
this.filterObj.depthCount = e.currentTarget.value;
-this.fetchGraphData({ queryParam: { 'depth':
this.filterObj.depthCount } });
+//legends property is added in queryParam to stop the legend
getting added in lineage graph whenever dept is changed.
+this.fetchGraphData({ queryParam: { 'depth':
this.filterObj.depthCount }, 'legends': false });
},
onClickResetLineage: function() {
this.LineageHelperRef.refresh();
@@ -252,7 +253,7 @@ define(['require',
if (that.isDestroyed) {
return;
}
-
+data["legends"] = options ? options.legends : true;
that.createGraph(data);
that.renderLineageTypeSearch(data);
},
@@ -268,12 +269,12 @@ define(['require',
createGraph: function(data) {
var that = this;
$('.resizeGraph').css("height", this.$('.svg').height() +
"px");
-
this.LineageHelperRef = new LineageHelper.default({
entityDefCollection:
this.entityDefCollection.fullCollection.toJSON(),
data: data,
el: this.$('.svg')[0],
legendsEl: this.$('.legends')[0],
+legends: data.legends,
getFilterObj: function() {
return {
isProcessHideCheck:
that.filterObj.isProcessHideCheck,
[atlas] branch branch-2.0 updated: ATLAS-4271 : When unauthorised user is tries to create a relationship, message thrown is incorrect.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 13b8d38 ATLAS-4271 : When unauthorised user is tries to create a
relationship, message thrown is incorrect.
13b8d38 is described below
commit 13b8d38997c5d0e9d0963cba34f91556d30df56c
Author: Jayendra Parab
AuthorDate: Fri Apr 30 22:48:29 2021 +0530
ATLAS-4271 : When unauthorised user is tries to create a relationship,
message thrown is incorrect.
Signed-off-by: nixonrodrigues
(cherry picked from commit 0384f4c0f428200bdd8cb46a7ae418b7acd6afdc)
---
.../store/graph/v2/AtlasRelationshipDefStoreV2.java| 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipDefStoreV2.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipDefStoreV2.java
index b1f8efd..7bc4b28 100644
---
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipDefStoreV2.java
+++
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipDefStoreV2.java
@@ -71,6 +71,8 @@ public class AtlasRelationshipDefStoreV2 extends
AtlasAbstractDefStoreV2 AtlasRelationshipDefStoreV1.create({}, {})",
relationshipDef, preCreateResult);
}
-verifyTypeReadAccess(relationshipDef.getEndDef1().getType());
-verifyTypeReadAccess(relationshipDef.getEndDef2().getType());
-
-
AtlasVertex vertex = (preCreateResult == null) ?
preCreate(relationshipDef) : preCreateResult;
AtlasRelationshipDef ret = toRelationshipDef(vertex);
@@ -220,8 +218,7 @@ public class AtlasRelationshipDefStoreV2 extends
AtlasAbstractDefStoreV2 AtlasRelationshipDefStoreV1.update({})",
relationshipDef);
}
-verifyTypeReadAccess(relationshipDef.getEndDef1().getType());
-verifyTypeReadAccess(relationshipDef.getEndDef2().getType());
+verifyTypeReadAccess(relationshipDef);
validateType(relationshipDef);
@@ -542,4 +539,9 @@ public class AtlasRelationshipDefStoreV2 extends
AtlasAbstractDefStoreV2
[atlas] branch master updated: ATLAS-4271 : When unauthorised user is tries to create a relationship, message thrown is incorrect.
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 0384f4c ATLAS-4271 : When unauthorised user is tries to create a
relationship, message thrown is incorrect.
0384f4c is described below
commit 0384f4c0f428200bdd8cb46a7ae418b7acd6afdc
Author: Jayendra Parab
AuthorDate: Fri Apr 30 22:48:29 2021 +0530
ATLAS-4271 : When unauthorised user is tries to create a relationship,
message thrown is incorrect.
Signed-off-by: nixonrodrigues
---
.../store/graph/v2/AtlasRelationshipDefStoreV2.java| 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipDefStoreV2.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipDefStoreV2.java
index b1f8efd..7bc4b28 100644
---
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipDefStoreV2.java
+++
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasRelationshipDefStoreV2.java
@@ -71,6 +71,8 @@ public class AtlasRelationshipDefStoreV2 extends
AtlasAbstractDefStoreV2 AtlasRelationshipDefStoreV1.create({}, {})",
relationshipDef, preCreateResult);
}
-verifyTypeReadAccess(relationshipDef.getEndDef1().getType());
-verifyTypeReadAccess(relationshipDef.getEndDef2().getType());
-
-
AtlasVertex vertex = (preCreateResult == null) ?
preCreate(relationshipDef) : preCreateResult;
AtlasRelationshipDef ret = toRelationshipDef(vertex);
@@ -220,8 +218,7 @@ public class AtlasRelationshipDefStoreV2 extends
AtlasAbstractDefStoreV2 AtlasRelationshipDefStoreV1.update({})",
relationshipDef);
}
-verifyTypeReadAccess(relationshipDef.getEndDef1().getType());
-verifyTypeReadAccess(relationshipDef.getEndDef2().getType());
+verifyTypeReadAccess(relationshipDef);
validateType(relationshipDef);
@@ -542,4 +539,9 @@ public class AtlasRelationshipDefStoreV2 extends
AtlasAbstractDefStoreV2
[atlas] branch branch-2.0 updated: ATLAS-4263: Fix KafkaUtils to always enclose property values in double-quotes (#137)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new e8c9bd8 ATLAS-4263: Fix KafkaUtils to always enclose property values
in double-quotes (#137)
e8c9bd8 is described below
commit e8c9bd8216e451a3db3afeda562e8986527bc6b4
Author: Vlad Glinsky <61428392+vladhlin...@users.noreply.github.com>
AuthorDate: Tue May 4 12:55:07 2021 +0300
ATLAS-4263: Fix KafkaUtils to always enclose property values in
double-quotes (#137)
(cherry picked from commit 21606bdc20e3890ddf9d26555fc71e4175310950)
---
.../java/org/apache/atlas/utils/KafkaUtils.java| 19 +
.../org/apache/atlas/utils/KafkaUtilsTest.java | 89 ++
2 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
b/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
index eea3311..1674422 100644
--- a/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
+++ b/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
@@ -318,20 +318,9 @@ public class KafkaUtils implements AutoCloseable {
return optionVal;
}
-String ret = optionVal;
-
-// For property values which have special chars like "@" or "/", we
need to enclose it in
-// double quotes, so that Kafka can parse it
-// If the property is already enclosed in double quotes, then do
nothing.
-if (optionVal.indexOf(0) != '"' &&
optionVal.indexOf(optionVal.length() - 1) != '"') {
-// If the string as special characters like except _,-
-final String SPECIAL_CHAR_LIST = "/!@#%^&*";
-
-if (StringUtils.containsAny(optionVal, SPECIAL_CHAR_LIST)) {
-ret = String.format("\"%s\"", optionVal);
-}
-}
-
-return ret;
+// Enclose property values in double quotes, so that Kafka can parse
it.
+// Escape all double quotes that may occur in the property value.
+String doubleQuoteEscaped = optionVal.replace("\"", "\\\"");
+return String.format("\"%s\"", doubleQuoteEscaped);
}
}
\ No newline at end of file
diff --git a/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java
b/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java
index 14739cd..562e28a 100644
--- a/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java
+++ b/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java
@@ -20,11 +20,15 @@ package org.apache.atlas.utils;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.kafka.common.config.SaslConfigs;
+import org.apache.kafka.common.config.types.Password;
+import org.apache.kafka.common.security.JaasContext;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.testng.annotations.Test;
-
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import static org.testng.Assert.assertNull;
@@ -55,9 +59,10 @@ public class KafkaUtilsTest {
assertTrue(newPropertyValue.contains(loginModuleName),
"loginModuleName not present in new property");
assertTrue(newPropertyValue.contains(loginModuleControlFlag),"loginModuleControlFlag
not present in new property");
-assertTrue(newPropertyValue.contains("useKeyTab=" + optionUseKeyTab),
"useKeyTab not present in new property or value doesn't match");
-assertTrue(newPropertyValue.contains("storeKey="+ optionStoreKey),
"storeKey not present in new property or value doesn't match");
-assertTrue(newPropertyValue.contains("serviceName=" +
optionServiceName), "serviceName not present in new property or value doesn't
match");
+assertTrue(newPropertyValue.contains("useKeyTab=\"" + optionUseKeyTab
+ "\""), "useKeyTab not present in new property or value doesn't match");
+assertTrue(newPropertyValue.contains("storeKey=\""+ optionStoreKey +
"\""), "storeKey not present in new property or value doesn't match");
+assertTrue(newPropertyValue.contains("serviceName=\"" +
optionServiceName + "\""), "serviceName not present in new property or value
doesn't match");
+assertJaaSConfigLoadable(newPropertyValue);
}
@@ -82,9 +87,10 @@ public class KafkaUtilsTest {
assertTrue(newPropertyValue.contains(loginModuleName),
"loginModuleName not present in new proper
[atlas] branch master updated: ATLAS-4263: Fix KafkaUtils to always enclose property values in double-quotes (#137)
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 21606bd ATLAS-4263: Fix KafkaUtils to always enclose property values
in double-quotes (#137)
21606bd is described below
commit 21606bdc20e3890ddf9d26555fc71e4175310950
Author: Vlad Glinsky <61428392+vladhlin...@users.noreply.github.com>
AuthorDate: Tue May 4 12:55:07 2021 +0300
ATLAS-4263: Fix KafkaUtils to always enclose property values in
double-quotes (#137)
---
.../java/org/apache/atlas/utils/KafkaUtils.java| 19 +
.../org/apache/atlas/utils/KafkaUtilsTest.java | 89 ++
2 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
b/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
index eea3311..1674422 100644
--- a/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
+++ b/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java
@@ -318,20 +318,9 @@ public class KafkaUtils implements AutoCloseable {
return optionVal;
}
-String ret = optionVal;
-
-// For property values which have special chars like "@" or "/", we
need to enclose it in
-// double quotes, so that Kafka can parse it
-// If the property is already enclosed in double quotes, then do
nothing.
-if (optionVal.indexOf(0) != '"' &&
optionVal.indexOf(optionVal.length() - 1) != '"') {
-// If the string as special characters like except _,-
-final String SPECIAL_CHAR_LIST = "/!@#%^&*";
-
-if (StringUtils.containsAny(optionVal, SPECIAL_CHAR_LIST)) {
-ret = String.format("\"%s\"", optionVal);
-}
-}
-
-return ret;
+// Enclose property values in double quotes, so that Kafka can parse
it.
+// Escape all double quotes that may occur in the property value.
+String doubleQuoteEscaped = optionVal.replace("\"", "\\\"");
+return String.format("\"%s\"", doubleQuoteEscaped);
}
}
\ No newline at end of file
diff --git a/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java
b/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java
index 14739cd..562e28a 100644
--- a/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java
+++ b/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java
@@ -20,11 +20,15 @@ package org.apache.atlas.utils;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.kafka.common.config.SaslConfigs;
+import org.apache.kafka.common.config.types.Password;
+import org.apache.kafka.common.security.JaasContext;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.testng.annotations.Test;
-
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import static org.testng.Assert.assertNull;
@@ -55,9 +59,10 @@ public class KafkaUtilsTest {
assertTrue(newPropertyValue.contains(loginModuleName),
"loginModuleName not present in new property");
assertTrue(newPropertyValue.contains(loginModuleControlFlag),"loginModuleControlFlag
not present in new property");
-assertTrue(newPropertyValue.contains("useKeyTab=" + optionUseKeyTab),
"useKeyTab not present in new property or value doesn't match");
-assertTrue(newPropertyValue.contains("storeKey="+ optionStoreKey),
"storeKey not present in new property or value doesn't match");
-assertTrue(newPropertyValue.contains("serviceName=" +
optionServiceName), "serviceName not present in new property or value doesn't
match");
+assertTrue(newPropertyValue.contains("useKeyTab=\"" + optionUseKeyTab
+ "\""), "useKeyTab not present in new property or value doesn't match");
+assertTrue(newPropertyValue.contains("storeKey=\""+ optionStoreKey +
"\""), "storeKey not present in new property or value doesn't match");
+assertTrue(newPropertyValue.contains("serviceName=\"" +
optionServiceName + "\""), "serviceName not present in new property or value
doesn't match");
+assertJaaSConfigLoadable(newPropertyValue);
}
@@ -82,9 +87,10 @@ public class KafkaUtilsTest {
assertTrue(newPropertyValue.contains(loginModuleName),
"loginModuleName not present in new property");
assertTrue(newPropertyValue.contains(loginModuleControlFlag),
[atlas] branch branch-2.0 updated: ATLAS-4250 : Support HA for admin/tasks API.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 0e8f0e5 ATLAS-4250 : Support HA for admin/tasks API.
0e8f0e5 is described below
commit 0e8f0e556b5811ea30f78c21740717651f892ade
Author: nixonrodrigues
AuthorDate: Wed Apr 21 15:39:26 2021 +0530
ATLAS-4250 : Support HA for admin/tasks API.
(cherry picked from commit 2e0caefdd3b37df8ff9322dc4c14306d2df9dac6)
---
.../src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java | 2 +-
.../test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
b/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
index 98eb3d3..a1d30ba 100644
--- a/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
+++ b/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
@@ -110,7 +110,7 @@ public class ActiveServerFilter implements Filter {
}
final String adminUriNotFiltered[] = { "/admin/export", "/admin/import",
"/admin/importfile", "/admin/audits",
-"/admin/purge", "/admin/expimp/audit", "/admin/metrics",
"/admin/server", "/admin/audit/" };
+"/admin/purge", "/admin/expimp/audit", "/admin/metrics",
"/admin/server", "/admin/audit/", "admin/tasks"};
private boolean isFilteredURI(ServletRequest servletRequest) {
HttpServletRequest httpServletRequest = (HttpServletRequest)
servletRequest;
String requestURI = httpServletRequest.getRequestURI();
diff --git
a/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java
b/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java
index defa5bb..04b4e4a 100644
---
a/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java
+++
b/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java
@@ -107,7 +107,7 @@ public class ActiveServerFilterTest {
public void
adminImportRequestsToPassiveServerShouldToActiveServerAddress() throws
IOException, ServletException {
String importExportUrls[] = {"api/admin/export", "api/admin/import",
"api/admin/importfile", "api/admin/audits",
"api/admin/purge", "api/admin/expimp/audit",
"api/admin/metrics",
-"api/admin/server/dummy_name",
"api/admin/audit/dummy_guid/details"};
+"api/admin/server/dummy_name",
"api/admin/audit/dummy_guid/details", "api/admin/tasks"};
for (String partialUrl : importExportUrls) {
when(serviceState.getState()).thenReturn(ServiceState.ServiceStateValue.PASSIVE);
[atlas] branch master updated: ATLAS-4250 : Support HA for admin/tasks API.
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 2e0caef ATLAS-4250 : Support HA for admin/tasks API.
2e0caef is described below
commit 2e0caefdd3b37df8ff9322dc4c14306d2df9dac6
Author: nixonrodrigues
AuthorDate: Wed Apr 21 15:39:26 2021 +0530
ATLAS-4250 : Support HA for admin/tasks API.
---
.../src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java | 2 +-
.../test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
b/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
index 98eb3d3..a1d30ba 100644
--- a/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
+++ b/webapp/src/main/java/org/apache/atlas/web/filters/ActiveServerFilter.java
@@ -110,7 +110,7 @@ public class ActiveServerFilter implements Filter {
}
final String adminUriNotFiltered[] = { "/admin/export", "/admin/import",
"/admin/importfile", "/admin/audits",
-"/admin/purge", "/admin/expimp/audit", "/admin/metrics",
"/admin/server", "/admin/audit/" };
+"/admin/purge", "/admin/expimp/audit", "/admin/metrics",
"/admin/server", "/admin/audit/", "admin/tasks"};
private boolean isFilteredURI(ServletRequest servletRequest) {
HttpServletRequest httpServletRequest = (HttpServletRequest)
servletRequest;
String requestURI = httpServletRequest.getRequestURI();
diff --git
a/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java
b/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java
index defa5bb..04b4e4a 100644
---
a/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java
+++
b/webapp/src/test/java/org/apache/atlas/web/filters/ActiveServerFilterTest.java
@@ -107,7 +107,7 @@ public class ActiveServerFilterTest {
public void
adminImportRequestsToPassiveServerShouldToActiveServerAddress() throws
IOException, ServletException {
String importExportUrls[] = {"api/admin/export", "api/admin/import",
"api/admin/importfile", "api/admin/audits",
"api/admin/purge", "api/admin/expimp/audit",
"api/admin/metrics",
-"api/admin/server/dummy_name",
"api/admin/audit/dummy_guid/details"};
+"api/admin/server/dummy_name",
"api/admin/audit/dummy_guid/details", "api/admin/tasks"};
for (String partialUrl : importExportUrls) {
when(serviceState.getState()).thenReturn(ServiceState.ServiceStateValue.PASSIVE);
[atlas] branch branch-2.0 updated: ATLAS-3887 ATLAS-4242: UI : Fixed Consistency and highlighting issues while switching between old and new UI.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 9f9864d ATLAS-3887 ATLAS-4242: UI : Fixed Consistency and
highlighting issues while switching between old and new UI.
9f9864d is described below
commit 9f9864d3b84ca6b31dc45117a2830b2114f195e0
Author: prasad pawar
AuthorDate: Wed Apr 14 14:43:12 2021 +0530
ATLAS-3887 ATLAS-4242: UI : Fixed Consistency and highlighting issues while
switching between old and new UI.
Signed-off-by: nixonrodrigues
(cherry picked from commit 4d027b4bf1a0c6b4329422a75518f010c579133a)
---
.../public/js/views/glossary/GlossaryLayoutView.js | 11 +++-
.../public/js/views/search/SearchLayoutView.js | 20 ++-
dashboardv2/public/js/views/tag/TagLayoutView.js | 5 +-
dashboardv3/public/js/router/Router.js | 35
.../js/views/search/tree/GlossaryTreeLayoutView.js | 62 --
5 files changed, 110 insertions(+), 23 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index 0de5c35..a13ad4a 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -216,7 +216,8 @@ define(['require',
}
if (Utils.getUrlState.isGlossaryTab()) {
var obj = this.query[this.viewType],
-$tree = this.ui[(this.viewType == "term" ? "termTree"
: "categoryTree")]
+$tree = this.ui[(this.viewType == "term" ? "termTree"
: "categoryTree")];
+obj["gId"] = that.value.gId; //this Property added,
Because when we toggle the GlossaryViewButton it does not adds the gId which is
required for selection.
if (obj.guid) {
var node = $tree.jstree(true).get_node(obj.guid);
if (node) {
@@ -826,11 +827,17 @@ define(['require',
obj["gId"] = selectedItem.guid;
}
this.query[this.viewType] = _.extend(obj,
_.omit(this.value, 'gId'), _.pick(this.glossary.selectedItem, 'model', 'type',
'gType', 'guid'), { "viewType": this.viewType, "isNodeNotFoundAtLoad":
this.query[this.viewType].isNodeNotFoundAtLoad });
+//Below condition if for adding term Param to the URL for
selection Purpose while switching from Old UI to New UI on term selection.
+if (selectedItem.type === "GlossaryTerm") {
+obj['term'] = selectedItem.text + '@' +
selectedItem.glossaryName;
+} else {
+delete obj.term;
+}
Utils.setUrl({
url: '#!/glossary/' + obj.guid,
mergeBrowserUrl: false,
trigger: true,
-urlParams: _.omit(obj, 'model', 'guid', 'type',
'isNodeNotFoundAtLoad'),
+urlParams: _.omit(obj, 'model', 'type',
'isNodeNotFoundAtLoad'), //Guid has been removed from here because we need in
the URL for Highlighting issue.
updateTabState: true
});
}
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js
b/dashboardv2/public/js/views/search/SearchLayoutView.js
index 1dbda7f..be46d7e 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchLayoutView.js
@@ -625,6 +625,8 @@ define(['require',
}
},
renderTermList: function() {
+this.glossaryTermArray = null; //This Value is created to
store the result of search Term while basic search through term.
+var that = this;
var getTypeAheadData = function(data, params) {
var dataList = data.entities,
foundOptions = [];
@@ -637,7 +639,7 @@ define(['require',
}
});
return foundOptions;
-}
+};
this.ui.termLov.select2({
placeholder: "Search Term",
allowClear: true,
@@ -654,6 +656,7 @@ define(['require',
};
},
processResults: function(data, params) {
+that.glossaryTermArray = getTypeAheadData(data,
params); //storing the search Results obj
return {
[atlas] branch master updated: ATLAS-3887 ATLAS-4242: UI : Fixed Consistency and highlighting issues while switching between old and new UI.
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 4d027b4 ATLAS-3887 ATLAS-4242: UI : Fixed Consistency and
highlighting issues while switching between old and new UI.
4d027b4 is described below
commit 4d027b4bf1a0c6b4329422a75518f010c579133a
Author: prasad pawar
AuthorDate: Wed Apr 14 14:43:12 2021 +0530
ATLAS-3887 ATLAS-4242: UI : Fixed Consistency and highlighting issues while
switching between old and new UI.
Signed-off-by: nixonrodrigues
---
.../public/js/views/glossary/GlossaryLayoutView.js | 11 +++-
.../public/js/views/search/SearchLayoutView.js | 20 ++-
dashboardv2/public/js/views/tag/TagLayoutView.js | 5 +-
dashboardv3/public/js/router/Router.js | 35
.../js/views/search/tree/GlossaryTreeLayoutView.js | 62 --
5 files changed, 110 insertions(+), 23 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index 0de5c35..a13ad4a 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -216,7 +216,8 @@ define(['require',
}
if (Utils.getUrlState.isGlossaryTab()) {
var obj = this.query[this.viewType],
-$tree = this.ui[(this.viewType == "term" ? "termTree"
: "categoryTree")]
+$tree = this.ui[(this.viewType == "term" ? "termTree"
: "categoryTree")];
+obj["gId"] = that.value.gId; //this Property added,
Because when we toggle the GlossaryViewButton it does not adds the gId which is
required for selection.
if (obj.guid) {
var node = $tree.jstree(true).get_node(obj.guid);
if (node) {
@@ -826,11 +827,17 @@ define(['require',
obj["gId"] = selectedItem.guid;
}
this.query[this.viewType] = _.extend(obj,
_.omit(this.value, 'gId'), _.pick(this.glossary.selectedItem, 'model', 'type',
'gType', 'guid'), { "viewType": this.viewType, "isNodeNotFoundAtLoad":
this.query[this.viewType].isNodeNotFoundAtLoad });
+//Below condition if for adding term Param to the URL for
selection Purpose while switching from Old UI to New UI on term selection.
+if (selectedItem.type === "GlossaryTerm") {
+obj['term'] = selectedItem.text + '@' +
selectedItem.glossaryName;
+} else {
+delete obj.term;
+}
Utils.setUrl({
url: '#!/glossary/' + obj.guid,
mergeBrowserUrl: false,
trigger: true,
-urlParams: _.omit(obj, 'model', 'guid', 'type',
'isNodeNotFoundAtLoad'),
+urlParams: _.omit(obj, 'model', 'type',
'isNodeNotFoundAtLoad'), //Guid has been removed from here because we need in
the URL for Highlighting issue.
updateTabState: true
});
}
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js
b/dashboardv2/public/js/views/search/SearchLayoutView.js
index 1dbda7f..be46d7e 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchLayoutView.js
@@ -625,6 +625,8 @@ define(['require',
}
},
renderTermList: function() {
+this.glossaryTermArray = null; //This Value is created to
store the result of search Term while basic search through term.
+var that = this;
var getTypeAheadData = function(data, params) {
var dataList = data.entities,
foundOptions = [];
@@ -637,7 +639,7 @@ define(['require',
}
});
return foundOptions;
-}
+};
this.ui.termLov.select2({
placeholder: "Search Term",
allowClear: true,
@@ -654,6 +656,7 @@ define(['require',
};
},
processResults: function(data, params) {
+that.glossaryTermArray = getTypeAheadData(data,
params); //storing the search Results obj
return {
results: getTypeAheadData(data, params)
};
[atlas] 01/02: Revert "ATLAS-3903: UI - Glossary category not reflected in the tree after creation."
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit ae0f66d015e9a0d79a6997e044e61e645890f14b
Author: nixonrodrigues
AuthorDate: Wed Apr 14 16:01:39 2021 +0530
Revert "ATLAS-3903: UI - Glossary category not reflected in the tree after
creation."
This reverts commit 6c259a61875e9110208b993824d45493a0e44468.
---
.../js/views/glossary/GlossaryDetailLayoutView.js | 5 +-
.../public/js/views/glossary/GlossaryLayoutView.js | 54 +---
.../js/views/glossary/GlossaryDetailLayoutView.js | 5 +-
.../js/views/search/tree/GlossaryTreeLayoutView.js | 73 +++---
4 files changed, 42 insertions(+), 95 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
index 24a8b06..bb8fe8f 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -346,8 +346,7 @@ define(['require',
return terms;
},
onClickAddTermBtn: function(e) {
-var that = this,
-glossary = this.glossaryCollection;
+var glossary = this.glossaryCollection;
if (this.value && this.value.gId) {
var foundModel = this.glossaryCollection.find({ guid:
this.value.gId });
if (foundModel) {
@@ -360,7 +359,7 @@ define(['require',
}
var obj = {
callback: function() {
-that.getData();
+this.getData();
},
glossaryCollection: glossary,
},
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index ac7435c..5d9ba74 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -344,56 +344,34 @@ define(['require',
node: parent,
objGuid: obj.guid
});
+
if (type == "category" && obj.categories) {
-var isSelected = false,
-parentGuid = obj.guid,
-parentCategoryGuid = null,
-categoryList = [],
-catrgoryRelation = [];
_.each(obj.categories, function(category) {
-if (that.options.value) {
-isSelected = that.options.value.guid ?
that.options.value.guid == category.categoryGuid : false;
+if (category.parentCategoryGuid) {
+return;
}
-
var typeName = category.typeName ||
"GlossaryCategory",
guid = category.categoryGuid,
categoryObj = {
-id: guid,
-guid: guid,
-text: _.escape(category.displayText),
-type: typeName,
-gType: "category",
-glossaryId: obj.guid,
-glossaryName: obj.name,
-children: [],
-model: category,
-icon: "fa fa-files-o"
+"text": _.escape(category.displayText),
+"type": typeName,
+"gType": "category",
+"guid": guid,
+"id": guid,
+"parent": obj,
+"glossaryId": obj.guid,
+"glossaryName": obj.name,
+"model": category,
+"children": true,
+"icon": "fa fa-files-o",
};
categoryObj.state = getSelectedState({
index: i,
node: categoryObj,
objGuid: guid
})
-if (category.parentCategor
