Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor: Fix showing soft deleted entities #14205

Merged
merged 1 commit into from
Dec 2, 2023
Merged

Minor: Fix showing soft deleted entities #14205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChartRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public EntityUpdater getUpdater(Chart original, Chart updated, Operation operati

@Override
public EntityInterface getParentEntity(Chart entity, String fields) {
return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED);
return Entity.getEntity(entity.getService(), fields, Include.ALL);
}

public class ChartUpdater extends ColumnEntityUpdater {
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ContainerRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public void validateTags(Container container) {

@Override
public EntityInterface getParentEntity(Container entity, String fields) {
return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED);
return Entity.getEntity(entity.getService(), fields, Include.ALL);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DashboardRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public EntityUpdater getUpdater(Dashboard original, Dashboard updated, Operation

@Override
public EntityInterface getParentEntity(Dashboard entity, String fields) {
return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED);
return Entity.getEntity(entity.getService(), fields, Include.ALL);
}

private List<EntityReference> getRelatedEntities(Dashboard dashboard, String entityType) {
Expand Down
4 changes: 2 additions & 2 deletions ...metadata-service/src/main/java/org/openmetadata/service/jdbi3/GlossaryTermRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ protected void closeTask(String user, CloseTask closeTask) {
@Override
public EntityInterface getParentEntity(GlossaryTerm entity, String fields) {
return entity.getParent() != null
? Entity.getEntity(entity.getParent(), fields, Include.NON_DELETED)
: Entity.getEntity(entity.getGlossary(), fields, Include.NON_DELETED);
? Entity.getEntity(entity.getParent(), fields, Include.ALL)
: Entity.getEntity(entity.getGlossary(), fields, Include.ALL);
}

private void addGlossaryRelationship(GlossaryTerm term) {
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/MlModelRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public EntityUpdater getUpdater(MlModel original, MlModel updated, Operation ope

@Override
public EntityInterface getParentEntity(MlModel entity, String fields) {
return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED);
return Entity.getEntity(entity.getService(), fields, Include.ALL);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/PipelineRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public void applyTags(Pipeline pipeline) {

@Override
public EntityInterface getParentEntity(Pipeline entity, String fields) {
return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED);
return Entity.getEntity(entity.getService(), fields, Include.ALL);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SearchIndexRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public void applyTags(SearchIndex searchIndex) {

@Override
public EntityInterface getParentEntity(SearchIndex entity, String fields) {
return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED);
return Entity.getEntity(entity.getService(), fields, Include.ALL);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...adata-service/src/main/java/org/openmetadata/service/jdbi3/StoredProcedureRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public StoredProcedureUpdater getUpdater(StoredProcedure original, StoredProcedu

@Override
public EntityInterface getParentEntity(StoredProcedure entity, String fields) {
return Entity.getEntity(entity.getDatabaseSchema(), fields, Include.NON_DELETED);
return Entity.getEntity(entity.getDatabaseSchema(), fields, Include.ALL);
}

public void setService(StoredProcedure storedProcedure, EntityReference service) {
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TopicRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public void applyTags(Topic topic) {

@Override
public EntityInterface getParentEntity(Topic entity, String fields) {
return Entity.getEntity(entity.getService(), fields, Include.NON_DELETED);
return Entity.getEntity(entity.getService(), fields, Include.ALL);
}

@Override
Expand Down