Skip to content

NIFI-14874 Unable to move destination of a Connection to a Process Group when source component is running #10241

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NIFI-14874 Unable to move destination of a Connection to a Process Group when source component is running #10241

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
6 changes: 0 additions & 6 deletions ...fi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,6 @@ public void setRelationships(final Collection<Relationship> newRelationships) {
return;
}

try {
getSource().verifyCanUpdate();
} catch (final IllegalStateException ise) {
throw new IllegalStateException("Cannot update the relationships for Connection", ise);
}

try {
this.relationships.set(new ArrayList<>(newRelationships));
getSource().updateConnection(this);
Expand Down
8 changes: 6 additions & 2 deletions ...s/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
-->

<h2 mat-dialog-title>
{{ connectionReadonly || sourceReadonly || destinationReadonly ? 'Connection Details' : 'Edit Connection' }}
{{ connectionReadonly
|| sourceReadonly && destinationType != ComponentType.ProcessGroup && destinationType != ComponentType.RemoteProcessGroup
|| destinationReadonly ? 'Connection Details' : 'Edit Connection' }}
</h2>
<form class="edit-connection-form" [formGroup]="editConnectionForm">
<context-error-banner [context]="ErrorContextKey.CONNECTION"></context-error-banner>
Expand Down Expand Up @@ -252,7 +254,9 @@ <h2 mat-dialog-title>
</mat-tab-group>
@if ({ value: (saving$ | async)! }; as saving) {
<mat-dialog-actions align="end">
@if (connectionReadonly || sourceReadonly || destinationReadonly) {
@if (connectionReadonly
|| sourceReadonly && destinationType != ComponentType.ProcessGroup && destinationType != ComponentType.RemoteProcessGroup
|| destinationReadonly) {
<button mat-flat-button mat-dialog-close>Close</button>
} @else {
<button mat-button mat-dialog-close="CANCELLED">Cancel</button>
Expand Down
4 changes: 3 additions & 1 deletion ...ges/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ export class EditConnectionComponent extends TabbedDialog {
}

updateControlValueAccessorsForReadOnly(): void {
const disabled = this.connectionReadonly || this.sourceReadonly || this.destinationReadonly;
const disabled = this.connectionReadonly
|| this.sourceReadonly && this.destinationType != ComponentType.ProcessGroup && this.destinationType != ComponentType.RemoteProcessGroup
|| this.destinationReadonly;

// sourceReadonly is used to update the readonly / disable state of the form controls, note that
// the source control for local and remote groups is always disabled (see above) in this edit
Expand Down