date:20180418

atlas git commit: ATLAS-2578: Update metric queries for faster execution

2018-04-18 Thread apoorvnaik

Repository: atlas
Updated Branches:
  refs/heads/master 85aef3c05 -> 4a938d873


ATLAS-2578: Update metric queries for faster execution

Change-Id: Ic17ce74f8309fa61f9946d7295b1d161374ebe26


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/4a938d87
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/4a938d87
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/4a938d87

Branch: refs/heads/master
Commit: 4a938d873d63280d06678596af0a4f6c3f0a8255
Parents: 85aef3c
Author: apoorvnaik 
Authored: Wed Apr 11 20:30:02 2018 -0700
Committer: apoorvnaik 
Committed: Wed Apr 18 07:54:04 2018 -0700

--
 .../atlas/model/metrics/AtlasMetrics.java   |  42 ++--
 .../apache/atlas/services/MetricsService.java   | 196 +++
 .../atlas/util/AtlasGremlin2QueryProvider.java  |  21 +-
 .../atlas/util/AtlasGremlin3QueryProvider.java  |   8 +-
 .../atlas/util/AtlasGremlinQueryProvider.java   |   2 +-
 .../atlas/services/MetricsServiceTest.java  |  91 -
 .../atlas/web/resources/AdminResource.java  |  18 +-
 7 files changed, 201 insertions(+), 177 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/4a938d87/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java
--
diff --git 
a/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java 
b/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java
index cfccc96..c3304cc 100644
--- a/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java
+++ b/intg/src/main/java/org/apache/atlas/model/metrics/AtlasMetrics.java
@@ -36,13 +36,13 @@ import static 
com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown=true)
 public class AtlasMetrics {
-private Map> data;
+private Map> data;
 
 public AtlasMetrics() {
 setData(null);
 }
 
-public AtlasMetrics(Map> data) {
+public AtlasMetrics(Map> data) {
 setData(data);
 }
 
@@ -52,41 +52,41 @@ public class AtlasMetrics {
 }
 }
 
-public Map> getData() {
+public Map> getData() {
 return data;
 }
 
-public void setData(Map> data) {
+public void setData(Map> data) {
 this.data = data;
 }
 
 @JsonIgnore
-public void addData(String groupKey, String key, Number value) {
-Map> data = this.data;
+public void addMetric(String groupKey, String key, Object value) {
+Map> data = this.data;
 if (data == null) {
 data = new HashMap<>();
 }
-Map metricMap = data.get(groupKey);
-if (metricMap == null) {
-metricMap = new HashMap<>();
-data.put(groupKey, metricMap);
-}
+Map metricMap = data.computeIfAbsent(groupKey, k -> 
new HashMap<>());
 metricMap.put(key, value);
 setData(data);
 }
 
 @JsonIgnore
-public Number getMetric(String groupKey, String key) {
-Map> data = this.data;
-if (data == null) {
-return null;
-} else {
-Map metricMap = data.get(groupKey);
-if (metricMap == null || metricMap.isEmpty()) {
-return null;
-} else {
-return metricMap.get(key);
+public Number getNumericMetric(String groupKey, String key) {
+Object metric = getMetric(groupKey, key);
+return metric instanceof Number ? (Number) metric : null;
+}
+
+@JsonIgnore
+public Object getMetric(String groupKey, String key) {
+Map> data = this.data;
+Object ret = null;
+if (data != null) {
+Map metricMap = data.get(groupKey);
+if (metricMap != null && !metricMap.isEmpty()) {
+ret = metricMap.get(key);
 }
 }
+return ret;
 }
 }

http://git-wip-us.apache.org/repos/asf/atlas/blob/4a938d87/repository/src/main/java/org/apache/atlas/services/MetricsService.java
--
diff --git 
a/repository/src/main/java/org/apache/atlas/services/MetricsService.java 
b/repository/src/main/java/org/apache/atlas/services/MetricsService.java
index 0fa68b2..bc05ed2 100644
---

atlas git commit: ATLAS-2534: Glossary REST API (bugfix)

2018-04-18 Thread apoorvnaik

Repository: atlas
Updated Branches:
  refs/heads/master 4a938d873 -> cabc1e550


ATLAS-2534: Glossary REST API (bugfix)

Change-Id: Ic0b40d722f2a797db19dd7ee95ef30866e073128


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/cabc1e55
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/cabc1e55
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/cabc1e55

Branch: refs/heads/master
Commit: cabc1e55059b70cfab49e1ca960d2cdee6a3828f
Parents: 4a938d8
Author: apoorvnaik 
Authored: Mon Apr 16 14:02:31 2018 -0700
Committer: apoorvnaik 
Committed: Wed Apr 18 07:54:58 2018 -0700

--
 .../java/org/apache/atlas/AtlasErrorCode.java   |   3 +
 .../atlas/glossary/GlossaryCategoryUtils.java   |  98 
 .../apache/atlas/glossary/GlossaryService.java  |  49 +-
 .../atlas/glossary/GlossaryTermUtils.java   |  95 
 .../apache/atlas/glossary/GlossaryUtils.java|   7 +-
 .../store/graph/v1/EntityGraphRetriever.java|   8 +-
 .../atlas/glossary/GlossaryServiceTest.java | 153 +++
 .../org/apache/atlas/web/rest/GlossaryREST.java |   3 +
 8 files changed, 278 insertions(+), 138 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/cabc1e55/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
--
diff --git a/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java 
b/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
index bbb1b1a..3efe41c 100644
--- a/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
+++ b/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
@@ -168,6 +168,9 @@ public enum AtlasErrorCode {
 RELATIONSHIP_ALREADY_EXISTS(409, "ATLAS-409-00-004", "relationship {0} 
already exists between entities {1} and {2}"),
 TYPE_HAS_RELATIONSHIPS(409, "ATLAS-409-00-005", "Given type {0} has 
associated relationshipDefs"),
 SAVED_SEARCH_ALREADY_EXISTS(409, "ATLAS-409-00-006", "search named {0} 
already exists for user {1}"),
+GLOSSARY_ALREADY_EXISTS(409, "ATLAS-409-00-007", "Glossary with 
qualifiedName {0} already exists"),
+GLOSSARY_TERM_ALREADY_EXISTS(409, "ATLAS-409-00-009", "Glossary term with 
qualifiedName {0} already exists"),
+GLOSSARY_CATEGORY_ALREADY_EXISTS(409, "ATLAS-409-00-00A", "Glossary 
category with qualifiedName {0} already exists"),
 
 // All internal errors go here
 INTERNAL_ERROR(500, "ATLAS-500-00-001", "Internal server error {0}"),

http://git-wip-us.apache.org/repos/asf/atlas/blob/cabc1e55/repository/src/main/java/org/apache/atlas/glossary/GlossaryCategoryUtils.java
--
diff --git 
a/repository/src/main/java/org/apache/atlas/glossary/GlossaryCategoryUtils.java 
b/repository/src/main/java/org/apache/atlas/glossary/GlossaryCategoryUtils.java
index 46d8889..1423b98 100644
--- 
a/repository/src/main/java/org/apache/atlas/glossary/GlossaryCategoryUtils.java
+++ 
b/repository/src/main/java/org/apache/atlas/glossary/GlossaryCategoryUtils.java
@@ -29,9 +29,13 @@ import 
org.apache.atlas.repository.store.graph.AtlasRelationshipStore;
 import org.apache.atlas.type.AtlasRelationshipType;
 import org.apache.atlas.type.AtlasTypeRegistry;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -96,8 +100,8 @@ public class GlossaryCategoryUtils extends GlossaryUtils {
 }
 }
 
-private void processParentCategory(AtlasGlossaryCategory newObj, 
AtlasGlossaryCategory existing, RelationshipOperation op) throws 
AtlasBaseException {
-AtlasRelatedCategoryHeader newParent  = newObj.getParentCategory();
+private void processParentCategory(AtlasGlossaryCategory updatedCategory, 
AtlasGlossaryCategory existing, RelationshipOperation op) throws 
AtlasBaseException {
+AtlasRelatedCategoryHeader newParent  = 
updatedCategory.getParentCategory();
 AtlasRelatedCategoryHeader existingParent = 
existing.getParentCategory();
 switch (op) {
 case CREATE:
@@ -152,9 +156,9 @@ public class GlossaryCategoryUtils extends GlossaryUtils {
 }
 }
 
-private void processAssociatedTerms(AtlasGlossaryCategory newObj, 
AtlasGlossaryCategory existing, RelationshipOperation op) throws 
AtlasBaseException {
-Set newTerms  = newObj.getTerms();
-Set existingTerms = existing.getTerms();
+private void processAssociatedTerms(AtlasGlossaryCategory updatedCategory,

atlas git commit: ATLAS-2581: V2 Hive hook notifications - incorrect location for sd after moving table to a different database

2018-04-18 Thread madhan

Repository: atlas
Updated Branches:
  refs/heads/master cabc1e550 -> 6c49542b8


ATLAS-2581: V2 Hive hook notifications - incorrect location for sd after moving 
table to a different database


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/6c49542b
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/6c49542b
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/6c49542b

Branch: refs/heads/master
Commit: 6c49542b8e95b248c4a4062f13e499e2ebea93bf
Parents: cabc1e5
Author: Madhan Neethiraj 
Authored: Tue Apr 17 15:10:42 2018 -0700
Committer: Madhan Neethiraj 
Committed: Wed Apr 18 09:43:44 2018 -0700

--
 .../hive/hook/events/AlterTableRename.java  | 53 +---
 .../atlas/util/AtlasGremlin3QueryProvider.java  |  2 +-
 2 files changed, 35 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/6c49542b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
--
diff --git 
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
 
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
index eac095c..35b0586 100644
--- 
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
+++ 
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
@@ -72,6 +72,8 @@ public class AlterTableRename extends BaseHiveEvent {
 continue;
 }
 
+newTable = getHive().getTable(newTable.getDbName(), 
newTable.getTableName());
+
 break;
 }
 }
@@ -88,27 +90,27 @@ public class AlterTableRename extends BaseHiveEvent {
 // first update with oldTable info, so that the table will be created 
if it is not present in Atlas
 ret.add(new EntityUpdateRequestV2(getUserName(), new 
AtlasEntitiesWithExtInfo(oldTableEntity)));
 
+AtlasEntityWithExtInfo renamedTableEntity = toTableEntity(newTable);
+
 // update qualifiedName for all columns, partitionKeys, storageDesc
-String newTableQualifiedName = getQualifiedName(newTable);
+String renamedTableQualifiedName = (String) 
renamedTableEntity.getEntity().getAttribute(ATTRIBUTE_QUALIFIED_NAME);
 
-renameColumns((List) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_COLUMNS), oldTableEntity, 
newTableQualifiedName, ret);
-renameColumns((List) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_PARTITION_KEYS), 
oldTableEntity, newTableQualifiedName, ret);
-renameStorageDesc((AtlasObjectId) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_STORAGEDESC), oldTableEntity, 
newTableQualifiedName, ret);
+renameColumns((List) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_COLUMNS), oldTableEntity, 
renamedTableQualifiedName, ret);
+renameColumns((List) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_PARTITION_KEYS), 
oldTableEntity, renamedTableQualifiedName, ret);
+renameStorageDesc(oldTableEntity, renamedTableEntity, ret);
 
-// update qualifiedName and other attributes (like params - which 
include lastModifiedTime, lastModifiedBy) of the table
-AtlasEntityWithExtInfo newTableEntity = toTableEntity(newTable);
+// remove columns, partitionKeys and storageDesc - as they have 
already been updated above
+removeAttribute(renamedTableEntity, ATTRIBUTE_COLUMNS);
+removeAttribute(renamedTableEntity, ATTRIBUTE_PARTITION_KEYS);
+removeAttribute(renamedTableEntity, ATTRIBUTE_STORAGEDESC);
 
 // set previous name as the alias
-newTableEntity.getEntity().setAttribute(ATTRIBUTE_ALIASES, 
Collections.singletonList(oldTable.getTableName()));
-
-// remove columns, partitionKeys and storageDesc - as they have 
already been updated above
-removeAttribute(newTableEntity, ATTRIBUTE_COLUMNS);
-removeAttribute(newTableEntity, ATTRIBUTE_PARTITION_KEYS);
-removeAttribute(newTableEntity, ATTRIBUTE_STORAGEDESC);
+renamedTableEntity.getEntity().setAttribute(ATTRIBUTE_ALIASES, 
Collections.singletonList(oldTable.getTableName()));
 
 AtlasObjectId oldTableId = new 
AtlasObjectId(oldTableEntity.getEntity().getTypeName(), 
ATTRIBUTE_QUALIFIED_NAME, 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_QUALIFIED_NAME));
 
-ret.add(new EntityPartialUpdateRequestV2(getUserName(), oldTableId, 
newTableEntity));
+// update qualifiedName and other attributes (like params - which 
include lastModifiedTime, lastModifiedBy) of the table
+ret.add(new

atlas git commit: ATLAS-2581: V2 Hive hook notifications - incorrect location for sd after moving table to a different database

2018-04-18 Thread madhan

Repository: atlas
Updated Branches:
  refs/heads/branch-0.8 27fad9f4a -> 1a02dfe56


ATLAS-2581: V2 Hive hook notifications - incorrect location for sd after moving 
table to a different database

(cherry picked from commit fab76a4ea7b75167898577dfe02827b25df7a27a)


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/1a02dfe5
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/1a02dfe5
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/1a02dfe5

Branch: refs/heads/branch-0.8
Commit: 1a02dfe5642863ffe54a3903fdd499adc19099c4
Parents: 27fad9f
Author: Madhan Neethiraj 
Authored: Tue Apr 17 15:10:42 2018 -0700
Committer: Madhan Neethiraj 
Committed: Tue Apr 17 18:43:38 2018 -0700

--
 .../hive/hook/events/AlterTableRename.java  | 53 +---
 .../atlas/util/AtlasGremlin2QueryProvider.java  |  2 +-
 2 files changed, 35 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/1a02dfe5/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
--
diff --git 
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
 
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
index d5b9fc3..6ced340 100644
--- 
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
+++ 
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/AlterTableRename.java
@@ -72,6 +72,8 @@ public class AlterTableRename extends BaseHiveEvent {
 continue;
 }
 
+newTable = getHive().getTable(newTable.getDbName(), 
newTable.getTableName());
+
 break;
 }
 }
@@ -88,27 +90,27 @@ public class AlterTableRename extends BaseHiveEvent {
 // first update with oldTable info, so that the table will be created 
if it is not present in Atlas
 ret.add(new EntityUpdateRequestV2(getUserName(), new 
AtlasEntitiesWithExtInfo(oldTableEntity)));
 
+AtlasEntityWithExtInfo renamedTableEntity = toTableEntity(newTable);
+
 // update qualifiedName for all columns, partitionKeys, storageDesc
-String newTableQualifiedName = getQualifiedName(newTable);
+String renamedTableQualifiedName = (String) 
renamedTableEntity.getEntity().getAttribute(ATTRIBUTE_QUALIFIED_NAME);
 
-renameColumns((List) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_COLUMNS), oldTableEntity, 
newTableQualifiedName, ret);
-renameColumns((List) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_PARTITION_KEYS), 
oldTableEntity, newTableQualifiedName, ret);
-renameStorageDesc((AtlasObjectId) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_STORAGEDESC), oldTableEntity, 
newTableQualifiedName, ret);
+renameColumns((List) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_COLUMNS), oldTableEntity, 
renamedTableQualifiedName, ret);
+renameColumns((List) 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_PARTITION_KEYS), 
oldTableEntity, renamedTableQualifiedName, ret);
+renameStorageDesc(oldTableEntity, renamedTableEntity, ret);
 
-// update qualifiedName and other attributes (like params - which 
include lastModifiedTime, lastModifiedBy) of the table
-AtlasEntityWithExtInfo newTableEntity = toTableEntity(newTable);
+// remove columns, partitionKeys and storageDesc - as they have 
already been updated above
+removeAttribute(renamedTableEntity, ATTRIBUTE_COLUMNS);
+removeAttribute(renamedTableEntity, ATTRIBUTE_PARTITION_KEYS);
+removeAttribute(renamedTableEntity, ATTRIBUTE_STORAGEDESC);
 
 // set previous name as the alias
-newTableEntity.getEntity().setAttribute(ATTRIBUTE_ALIASES, 
Collections.singletonList(oldTable.getTableName()));
-
-// remove columns, partitionKeys and storageDesc - as they have 
already been updated above
-removeAttribute(newTableEntity, ATTRIBUTE_COLUMNS);
-removeAttribute(newTableEntity, ATTRIBUTE_PARTITION_KEYS);
-removeAttribute(newTableEntity, ATTRIBUTE_STORAGEDESC);
+renamedTableEntity.getEntity().setAttribute(ATTRIBUTE_ALIASES, 
Collections.singletonList(oldTable.getTableName()));
 
 AtlasObjectId oldTableId = new 
AtlasObjectId(oldTableEntity.getEntity().getTypeName(), 
ATTRIBUTE_QUALIFIED_NAME, 
oldTableEntity.getEntity().getAttribute(ATTRIBUTE_QUALIFIED_NAME));
 
-ret.add(new EntityPartialUpdateRequestV2(getUserName(), oldTableId, 
newTableEntity));
+// update qualifiedName and other attributes (like params - which 
include lastModifiedTime,

atlas git commit: ATLAS-2567: Updated DSL Search result to include classification list in AtlasSearchResult.

2018-04-18 Thread amestry

Repository: atlas
Updated Branches:
  refs/heads/master 6c49542b8 -> d55405955


ATLAS-2567: Updated DSL Search result to include classification list in 
AtlasSearchResult.

Signed-off-by: Ashutosh Mestry 


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/d5540595
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/d5540595
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/d5540595

Branch: refs/heads/master
Commit: d55405955d58417c263d964238c79c981d7fa9fe
Parents: 6c49542
Author: Ashutosh Mestry 
Authored: Tue Apr 17 10:03:51 2018 -0700
Committer: Ashutosh Mestry 
Committed: Wed Apr 18 13:36:58 2018 -0700

--
 .../java/org/apache/atlas/discovery/EntityDiscoveryService.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/d5540595/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
--
diff --git 
a/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
 
b/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
index 411d9b4..e443d9d 100644
--- 
a/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
+++ 
b/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
@@ -136,7 +136,7 @@ public class EntityDiscoveryService implements 
AtlasDiscoveryService {
 if (firstElement instanceof AtlasVertex) {
 for (Object element : queryResult) {
 if (element instanceof AtlasVertex) {
-
ret.addEntity(entityRetriever.toAtlasEntityHeader((AtlasVertex)element));
+
ret.addEntity(entityRetriever.toAtlasEntityHeaderWithClassifications((AtlasVertex)element));
 } else {
 LOG.warn("searchUsingDslQuery({}): expected an 
AtlasVertex; found unexpected entry in result {}", dslQuery, element);
 }

atlas git commit: ATLAS-2562 : UI: Support Business Terms and Categories (bug fixes)

2018-04-18 Thread kbhatt

Repository: atlas
Updated Branches:
  refs/heads/master fc17b38ee -> 6d999b0aa


ATLAS-2562 : UI: Support Business Terms and Categories (bug fixes)


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/6d999b0a
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/6d999b0a
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/6d999b0a

Branch: refs/heads/master
Commit: 6d999b0aa6ded46d678b5880da05b80e37d4b124
Parents: fc17b38
Author: kevalbhatt 
Authored: Wed Apr 18 12:40:53 2018 +0530
Committer: kevalbhatt 
Committed: Wed Apr 18 12:48:12 2018 +0530

--
 dashboardv2/public/js/utils/CommonViewFunction.js  | 6 +++---
 .../public/js/views/detail_page/DetailPageLayoutView.js| 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/6d999b0a/dashboardv2/public/js/utils/CommonViewFunction.js
--
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js 
b/dashboardv2/public/js/utils/CommonViewFunction.js
index bc5c170..b7e2c72 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -683,7 +683,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
 }
 CommonViewFunction.removeCategoryTermAssociation = function(options) {
 if (options) {
-var selectedGuid = options.guid,
+var selectedGuid = options.selectedGuid,
 termGuid = options.termGuid,
 isCategoryView = options.isCategoryView,
 isTermView = options.isTermView,
@@ -728,9 +728,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
 } else {
 var data = _.extend({}, model);
 if (isTermView) {
-data.categories = _.reject(data.categories, 
function(term) { return term.categoryGuid != selectedGuid });
+data.categories = _.reject(data.categories, 
function(term) { return term.categoryGuid == selectedGuid });
 } else {
-data.terms = _.reject(data.terms, function(term) { 
return term.termGuid != selectedGuid });
+data.terms = _.reject(data.terms, function(term) { 
return term.termGuid == selectedGuid });
 }
 
 newModel[isTermView ? "createEditTerm" : 
"createEditCategory"](_.extend(ajaxOptions, {

http://git-wip-us.apache.org/repos/asf/atlas/blob/6d999b0a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
--
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js 
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 9c2d146..eb17504 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -412,7 +412,9 @@ define(['require',
 var that = this,
 termData = "";
 _.each(data, function(val) {
-termData += '' + 
val.displayText + '';
+if (val.relationshipStatus == "ACTIVE") {
+termData += '' + 
val.displayText + '';
+}
 });
 this.ui.termList.find("span.btn").remove();
 this.ui.termList.prepend(termData);

atlas git commit: ATLAS-2584 : UI , Tag propagation : Unable to modify Tag propagation at an edge to BOTH or NONE

2018-04-18 Thread kbhatt

Repository: atlas
Updated Branches:
  refs/heads/master 6d999b0aa -> 85aef3c05


ATLAS-2584 : UI , Tag propagation : Unable to modify Tag propagation at an edge 
to BOTH or NONE

Signed-off-by: kevalbhatt 


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/85aef3c0
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/85aef3c0
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/85aef3c0

Branch: refs/heads/master
Commit: 85aef3c0543632358cb1b01085369bbf31b6404a
Parents: 6d999b0
Author: pratik24mac 
Authored: Wed Apr 18 14:52:25 2018 +0530
Committer: kevalbhatt 
Committed: Wed Apr 18 15:34:19 2018 +0530

--
 dashboardv2/public/js/views/graph/PropagationPropertyModal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/85aef3c0/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
--
diff --git a/dashboardv2/public/js/views/graph/PropagationPropertyModal.js 
b/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
index c192dff..76d62ef 100644
--- a/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
+++ b/dashboardv2/public/js/views/graph/PropagationPropertyModal.js
@@ -156,7 +156,7 @@ define(['require',
 this.ui.propagationOptions.attr("propagation", PropagationValue);
 var relationshipProp = {
 "propagateTags": that.getPropagationFlow({
-"relationshipData": that.apiGuid[entityId],
+"relationshipData": _.extend(that.apiGuid[entityId], { 
'propagateTags': PropagationValue }),
 "graphData": { from: { guid: 
this.edgeInfo.obj.fromEntityId } }
 })
 };

atlas git commit: ATLAS-2578: Update metric queries for faster execution

atlas git commit: ATLAS-2534: Glossary REST API (bugfix)

atlas git commit: ATLAS-2581: V2 Hive hook notifications - incorrect location for sd after moving table to a different database

atlas git commit: ATLAS-2581: V2 Hive hook notifications - incorrect location for sd after moving table to a different database

atlas git commit: ATLAS-2567: Updated DSL Search result to include classification list in AtlasSearchResult.

atlas git commit: ATLAS-2562 : UI: Support Business Terms and Categories (bug fixes)

atlas git commit: ATLAS-2584 : UI , Tag propagation : Unable to modify Tag propagation at an edge to BOTH or NONE

7 matches

Site Navigation

Mail list logo

Footer information