yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-20 22:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3294: Activity Feed: Assigning owner to a dashboard prints the object in feed (#3295)

Browse Source
This commit is contained in:
Vivek Ratnavel Subramanian 2022-03-08 21:55:31 -08:00 committed by GitHub
parent b156e68af0
commit 8e82709a48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
catalog-rest-service/src/main/java/org/openmetadata/catalog/util/ChangeEventParser.java
View File

@ -113,6 +113,8 @@ public final class ChangeEventParser {
Set<String> 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);

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/util/EntityUtil.java
View File

@ -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()));
}