From 8e82709a4832d08fea8c1130ef3d3c6ae183c02e Mon Sep 17 00:00:00 2001 From: Vivek Ratnavel Subramanian Date: Tue, 8 Mar 2022 21:55:31 -0800 Subject: [PATCH] Fix #3294: Activity Feed: Assigning owner to a dashboard prints the object in feed (#3295) --- .../org/openmetadata/catalog/util/ChangeEventParser.java | 7 ++++++- .../java/org/openmetadata/catalog/util/EntityUtil.java | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java index 6b1a9f2ac9e..32b5bf50bab 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java @@ -113,6 +113,8 @@ public final class ChangeEventParser { Set keys = jsonObject.asJsonObject().keySet(); if (keys.contains("displayName")) { return jsonObject.asJsonObject().getString("displayName"); + } else if (keys.contains("name")) { + return jsonObject.asJsonObject().getString("name"); } } } catch (JsonParsingException ex) { @@ -210,7 +212,10 @@ public final class ChangeEventParser { switch (changeType) { case ADD: - message = String.format("Added **%s**: `%s`", updatedField, getFieldValue(newFieldValue)); + String fieldValue = getFieldValue(newFieldValue); + if (fieldValue != null && !fieldValue.isEmpty()) { + message = String.format("Added **%s**: `%s`", updatedField, fieldValue); + } break; case UPDATE: message = getUpdateMessage(updatedField, oldFieldValue, newFieldValue); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/EntityUtil.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/EntityUtil.java index 45bb486459a..b3f38d78898 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/EntityUtil.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/util/EntityUtil.java @@ -183,6 +183,7 @@ public final class EntityUtil { if (owner.getType().equalsIgnoreCase("user")) { User ownerInstance = userDAO.findEntityById(id); owner.setName(ownerInstance.getName()); + owner.setDisplayName(ownerInstance.getDisplayName()); if (Optional.ofNullable(ownerInstance.getDeleted()).orElse(false)) { throw new IllegalArgumentException(CatalogExceptionMessage.deactivatedUser(id)); } @@ -190,6 +191,7 @@ public final class EntityUtil { Team ownerInstance = teamDAO.findEntityById(id); owner.setDescription(ownerInstance.getDescription()); owner.setName(ownerInstance.getName()); + owner.setDisplayName(ownerInstance.getDisplayName()); } else { throw new IllegalArgumentException(String.format("Invalid ownerType %s", owner.getType())); }