Skip to content

NIFI-15494 - In provenance lineage, display component type next to event type #10800

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

Open
pvillard31 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NIFI-15494 - In provenance lineage, display component type next to event type #10800

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
5 changes: 5 additions & 0 deletions ...ifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ public ProvenanceEventType getEventType() {
return record.getEventType();
}

@Override
public String getComponentType() {
return record.getComponentType();
}

@Override
public long getTimestamp() {
return record.getEventTime();
Expand Down
5 changes: 5 additions & 0 deletions ...work-api/src/main/java/org/apache/nifi/provenance/lineage/ProvenanceEventLineageNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ public interface ProvenanceEventLineageNode extends LineageNode {

ProvenanceEventType getEventType();

/**
* @return the type of the component that generated this event
*/
String getComponentType();

long getEventIdentifier();

List<String> getParentUuids();
Expand Down
14 changes: 14 additions & 0 deletions ...t-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class ProvenanceNodeDTO {
private String clusterNodeIdentifier;
private String type;
private String eventType;
private String componentType;
private Long millis;
private Date timestamp;

Expand Down Expand Up @@ -132,6 +133,19 @@ public void setEventType(String eventType) {
this.eventType = eventType;
}

/**
* @return if this is an event node, this is the type of the component that generated this event
*/
@Schema(description = "If the type is EVENT, this is the type of the component that generated the event."
)
public String getComponentType() {
return componentType;
}

public void setComponentType(String componentType) {
this.componentType = componentType;
}

/**
* @return timestamp of this node
*/
Expand Down
1 change: 1 addition & 0 deletions ...framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3544,6 +3544,7 @@ public ProvenanceNodeDTO createProvenanceEventNodeDTO(final ProvenanceEventLinea
dto.setId(node.getIdentifier());
dto.setType("EVENT");
dto.setEventType(node.getEventType().toString());
dto.setComponentType(node.getComponentType());
dto.setTimestamp(new Date(node.getTimestamp()));
dto.setMillis(node.getTimestamp());
dto.setFlowFileUuid(node.getFlowFileUuid());
Expand Down
1 change: 1 addition & 0 deletions nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/lineage/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface LineageNode {
clusterNodeIdentifier: string;
type: string;
eventType: string;
componentType?: string;
millis: number;
timestamp: string;
}
Expand Down
37 changes: 23 additions & 14 deletions ...rovenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,29 +851,38 @@ export class LineageComponent implements OnInit {
})
.each(function (this: any, d: any) {
const label: any = d3.select(this);
const lines: string[] = [];

if (d.eventType === 'CONTENT_MODIFIED' || d.eventType === 'ATTRIBUTES_MODIFIED') {
const lines: string[] = [];
if (d.eventType === 'CONTENT_MODIFIED') {
lines.push('CONTENT');
} else {
lines.push('ATTRIBUTES');
}
lines.push('MODIFIED');

// append each line
lines.forEach((line) => {
label
.append('tspan')
.attr('x', '0')
.attr('dy', '1.2em')
.text(function () {
return line;
});
});
label.attr('transform', 'translate(10,-14)');
} else {
label.text(d.eventType).attr('x', 10).attr('y', 4);
lines.push(d.eventType);
}

// add component type if available
if (d.componentType) {
lines.push(d.componentType);
}

// append each line
lines.forEach((line) => {
label
.append('tspan')
.attr('x', '0')
.attr('dy', '1.2em')
.text(function () {
return line;
});
});

// adjust vertical position based on number of lines
const yOffset = lines.length > 1 ? -7 * lines.length : -4;
label.attr('transform', `translate(10,${yOffset})`);
});
}

Expand Down
4 changes: 1 addition & 3 deletions .../frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
{{ bulletinEntity.bulletin.level }}
</div>
</div>
<pre class="whitespace-pre-wrap">{{
bulletinEntity.bulletin.message
}}</pre>
<pre class="whitespace-pre-wrap">{{ bulletinEntity.bulletin.message }}</pre>
</div>
</li>
}
Expand Down
Loading